speeding up and working on reporting, fixes #7597