911 Refactoring