Changes from yacov...