added ControlModes
fixed merge conflicts