Changes to the Muxing code