oded's changes