added server watch