Updated locator to use functions.