Speed logic changes