Calculations updated