Changed control scheme slightly