restructured report a bit