streaming events rework - part 2