Reworked controls