reporter changed
refactored