Reworked controllers