fixing omri's stupid actions