redefined circuit definitions as per Scott note