Refactor, enable both types of controls