adding watch/unwatch functionality