Calculations Update