Updated watch tasks