Added a locator-only version