#15 removed some fields from the report