Calculation wasn't working; broke it up to troubleshoot issue