added location properties
manual merge