added our solution from GPS 1.2