added some watch code
added some watch code