changed watch behaviour