Reduced number of wires, added puzzles