Update

Close to final schematic