report generator enhacement