- Refactoring for a proper protocol.: