Rearranging code to prepare for multiple REPORT types