Wei's updated odometer