working on locator