Fixed mux; added demux