working on restructured reporting #585