Revamped some code

Merged Hermes requested to merge revamp into 12.0

Merge request reports