merging shai's changes