Updates to GPS 1.1
?