add Mux and Latch