added server watcher