Some reworks for GPS