RPS refactoring