Tweaked mux stuff