Changes to motor control again