began changing over watch_links to use the new validators