Update tree with @chrmhoffman's changes
a116: GPS (thx to @chrmhoffmann