Updated to more accurate locators