Made some more schematic revisions for the Rev C