Updated for GPS rewrite