refactored reports