Calculations2 fixed