More work on the report, reimplemented changes done a few revisions back too