Applying original code - REPORT-461
Re applying changes in calculations - REPORT-461