modified locator functionality