Rearranging calculations and when the report ouputs