Made velocities more accurate