Changes to the way MUXing happens