updates to speed up calcs