Updated control scheme