updated from geogg122_current