Changing self.gis_location to current.gis_location