added mux improvement to Yao