820 Refactoring