REFACTORING primary