added location lookup
merged
merged
merged
merged