Velocity measurement is commented out, but ready to be used if needed