added watch feature