more use of the new gps location definitions