new code locator almost ready