simplyfied the wiring