oded's and adar's changes