- Refactored base control