Added watch/unwatch functions.