Refactroing reporting code
Merge Conflicts