Correct w calculations