[major] working watch rewrite