Modified locator version