Fixing report filds
Merging code