2 Commit (fg_report_rework)