Updated locator controllers