rework probes so events appear to come from demux