Major update to reporting.