Redid a bunch of report 1