Added locator code