updated so multiple watches do not happen