Refactored gps -> pnt
Resolved conflict