switched from locations to locators