Fixed and simplified schematic