adjust to add_watch