Updated schematic and model