UPDATED TO THE NEW WHS CALCULATION METHOD