added surroundings to location identifiers