fixed omri's stupid mistakes one more time