add robustness
add comment
add "setWatched" function