PS7 refactoring