Adding some code for comlpiance reports
changing some names