improved watching threads mechanism