Update to control scheme