Added gps stuff