Add better measurement of maximum velocities