Work on Locator function