Added more report stuff