Josh's updates for reporting