Updated for control mode 3