added location picker
merged