added location switcher