Updated watch task