Locators optimized