Changes to calcs