Updating to make gis convert work better