updated report generator