[IMP] Finished reporting improvements