Changed the report generation