Omri's changes