added location chooser