Delegater refactoring continues
Delegater refactoring continues