Put in more work on schematic