Calculation changes