A few changes required for the use of the CircuitMod