More up-to-date version of report than last commit

I left out some important things on the last commit, so here they are