Applying original code - REPORT-461