report refactoring && new intermediate report generation