v1.1 (changed locators)