967 Refactoring