Rework watch task