Fix watch flag.  Still pretty slow (~ 1s)