Calculations fixed