many wires and data structures added