Finished GPS 3.1