add watch and server