Demux revamp