Redid the circuit.  It's prettier, but hackish.