added watch support (not complete yet)