Modified the serf circuits to use the raw ones