continued to break apart calculation to troubleshoot