Reworked controllers.