Changed WaitForMotors logic