Changed order of GPS getting