Updating some of Calc's stuff