Added Watch task (again)