Changed control scheme