Many modifications to the report