added watch support