Some work on the schematic