improved locators