small change with server and watcher