Separate out the calcs