928 Refactoring