Fixed all calculations