prsr refactored