Working on report
Merge branch 'john'