Changes to Calc