Calculations all corrected