update watch and option logic