Added locator logic