further wiring simplification