Update to gps handling
Update to gps handling