Finished GPS 2.1