updated some of the demultiplex stuff