Some updates to GPS