Adding "Immediate Up" temporary event handling, until we don't batch events anymore