added location and properties