added watcher ability