Update mux with Chris Jones changes