changed controls
changed control scheme:
merging