put some more calcs