Added initial watcher