Added persistence to manually changing between locations.