more changes to match current test circuit.