Changed nextrip to use the non-gps version