rearrange for superficial changes in demux