BP-772 pull calculation steps apart for better analysis on performance
7 files changed