Calculations working again