added watcher stuff