mostly gsp changes, but GeoCountry is out too