Added mux 2 support