Revise wires/clean methodology and test