Added watch functionality