simplify watch logic