started refactoring to display both raw and final statistics