Updated schematic per Andrew Greenberg's recommendations