Improve GPS even more