Improved schematic and routing