Updated watch tasks to be more optimal