almost done with reporting changes