Updated and enable watch task