Integrate Kims changes to geo2mods