some changes to report generation