Update with new circuits from john