Updated schematic and client