Calculation improvements