More work on schematic