Completed gps 2.1