improve locators

improve locators part 2