Omri's Toffy Commit