refactor reporting
before tasleem to siko