More changes to circuit