Tidied up simulation schematic