oded's changes 2