added back in first moment calculation to calcs