added watch capabilities