updates for new calculations