Upgrade Velocity to 1.7