diff --git a/xschem/C4.sch b/xschem/C4.sch
index 6e52013..ddfd5e9 100644
--- a/xschem/C4.sch
+++ b/xschem/C4.sch
@@ -19,7 +19,7 @@
 N 250 -90 250 -50 {
 lab=vssa}
 N 250 -380 250 -360 {
-lab=vdda}
+lab=1v8}
 N 430 -160 430 -120 {
 lab=vssa}
 N 250 -190 390 -190 {
@@ -41,13 +41,13 @@
 N 430 -360 430 -220 {
 lab=#net2}
 N 430 -460 430 -420 {
-lab=vdda}
+lab=1v8}
 N 430 -390 460 -390 {
-lab=vdda}
+lab=1v8}
 N 460 -440 460 -390 {
-lab=vdda}
+lab=1v8}
 N 430 -440 460 -440 {
-lab=vdda}
+lab=1v8}
 N 290 -330 430 -330 {
 lab=#net2}
 N 370 -390 390 -390 {
@@ -71,47 +71,79 @@
 N 250 -50 430 -50 {
 lab=vssa}
 N 250 -460 430 -460 {
-lab=vdda}
-N 810 -310 1030 -310 {
-lab=vout}
+lab=1v8}
 N 430 -330 650 -330 {
 lab=#net2}
 N -160 -410 -110 -410 {
-lab=vdda}
+lab=1v8}
 N -160 -380 -110 -380 {
 lab=vssa}
 N 250 -460 250 -380 {
-lab=vdda}
+lab=1v8}
 N 340 -500 340 -460 {
-lab=vdda}
+lab=1v8}
 N 340 -50 340 -0 {
 lab=vssa}
-N 650 -330 810 -330 {}
-N 810 -330 810 -310 {}
-C {sky130_fd_pr/nfet_01v8.sym} 270 -120 0 1 {name=M3
+N 130 -250 130 -190 {
+lab=#net1}
+N 130 -460 130 -310 {
+lab=1v8}
+N 130 -460 250 -460 {
+lab=1v8}
+N 570 -270 570 -180 {
+lab=vssa}
+N 650 -330 760 -330 {
+lab=#net2}
+N 920 -310 1080 -310 {
+lab=vout}
+N 680 -290 760 -290 {
+lab=vout}
+N 680 -290 680 -60 {
+lab=vout}
+N 680 -60 1000 -60 {
+lab=vout}
+N 1000 -310 1000 -60 {
+lab=vout}
+N 830 -250 830 -180 {
+lab=vssa}
+N 830 -180 850 -180 {
+lab=vssa}
+N 850 -250 850 -180 {
+lab=vssa}
+N 830 -440 830 -370 {
+lab=1v8}
+N 830 -440 850 -440 {
+lab=1v8}
+N 850 -440 850 -370 {
+lab=1v8}
+N 840 -180 840 -140 {
+lab=vssa}
+N 840 -490 840 -440 {
+lab=1v8}
+C {sky130_fd_pr/nfet_01v8.sym} 270 -120 0 1 {name=M2
+L=0.15
+W=5  
+nf=1 mult=1
+model=nfet_01v8
+spiceprefix=X
+}
+C {sky130_fd_pr/nfet_01v8.sym} 270 -330 0 1 {name=M1
 L=0.15
 W=1  
 nf=1 mult=1
 model=nfet_01v8
 spiceprefix=X
 }
-C {sky130_fd_pr/nfet_01v8.sym} 270 -330 0 1 {name=M4
+C {sky130_fd_pr/nfet_01v8.sym} 410 -190 0 0 {name=M4
 L=0.15
-W=1  
+W=40 
 nf=1 mult=1
 model=nfet_01v8
 spiceprefix=X
 }
-C {sky130_fd_pr/nfet_01v8.sym} 410 -190 0 0 {name=M5
+C {sky130_fd_pr/pfet_01v8.sym} 410 -390 0 0 {name=M3
 L=0.15
-W=1  
-nf=1 mult=1
-model=nfet_01v8
-spiceprefix=X
-}
-C {sky130_fd_pr/pfet_01v8.sym} 410 -390 0 0 {name=M11
-L=0.15
-W=1
+W=10
 nf=1 mult=1
 model=pfet_01v8
 spiceprefix=X
@@ -119,7 +151,7 @@
 C {devices/lab_pin.sym} 370 -390 0 0 {name=l10 sig_type=std_logic lab=vth}
 C {devices/lab_pin.sym} 320 -120 0 1 {name=l11 sig_type=std_logic lab=vtl}
 C {devices/lab_pin.sym} -20 -190 0 0 {name=l12 sig_type=std_logic lab=vin}
-C {devices/lab_pin.sym} 1030 -310 0 1 {name=l13 sig_type=std_logic lab=vout}
+C {devices/lab_pin.sym} 1080 -310 0 1 {name=l13 sig_type=std_logic lab=vout}
 C {devices/ipin.sym} -100 -540 0 0 {name=p1 lab=vth}
 C {devices/ipin.sym} -100 -510 0 0 {name=p2 lab=vtl}
 C {devices/ipin.sym} -100 -480 0 0 {name=p3 lab=vin}
@@ -129,10 +161,16 @@
 C {devices/lab_pin.sym} -90 -480 0 1 {name=l14 sig_type=std_logic lab=vin}
 C {devices/lab_pin.sym} -120 -450 0 0 {name=l15 sig_type=std_logic lab=vout}
 C {devices/iopin.sym} -120 -380 0 0 {name=p5 lab=vssa}
-C {devices/iopin.sym} -120 -410 0 0 {name=p6 lab=vdda}
+C {devices/iopin.sym} -120 -410 0 0 {name=p6 lab=1v8}
 C {sky130_fd_pr/cap_mim_m3_1.sym} 50 -190 1 0 {name=C2 model=cap_mim_m3_1 W=1 L=1 MF=100 spiceprefix=X}
-C {devices/lab_pin.sym} -160 -410 0 0 {name=l1 sig_type=std_logic lab=vdda}
+C {devices/lab_pin.sym} -160 -410 0 0 {name=l1 sig_type=std_logic lab=1v8}
 C {devices/lab_pin.sym} -160 -380 0 0 {name=l2 sig_type=std_logic lab=vssa}
-C {devices/lab_pin.sym} 340 -500 0 0 {name=l3 sig_type=std_logic lab=vdda}
+C {devices/lab_pin.sym} 340 -500 0 0 {name=l3 sig_type=std_logic lab=1v8}
 C {devices/lab_pin.sym} 340 0 0 0 {name=l6 sig_type=std_logic lab=vssa}
 C {devices/lab_pin.sym} 220 -330 0 0 {name=l7 sig_type=std_logic lab=vssa}
+C {sky130_fd_pr/cap_mim_m3_1.sym} 130 -280 0 0 {name=C1 model=cap_mim_m3_1 W=3 L=3 MF=100 spiceprefix=X}
+C {sky130_fd_pr/cap_mim_m3_1.sym} 570 -300 0 0 {name=C3 model=cap_mim_m3_1 W=3 L=3 MF=100 spiceprefix=X}
+C {devices/lab_pin.sym} 570 -180 0 0 {name=l4 sig_type=std_logic lab=vssa}
+C {sky130_sc_ams__ota_1.sym} 840 -310 0 0 {name=x1}
+C {devices/lab_pin.sym} 840 -490 0 0 {name=l5 sig_type=std_logic lab=1v8}
+C {devices/lab_pin.sym} 840 -140 0 0 {name=l16 sig_type=std_logic lab=vssa}
diff --git a/xschem/user_analog_project_wrapper.sch b/xschem/user_analog_project_wrapper.sch
index 556ed8e..62dba90 100644
--- a/xschem/user_analog_project_wrapper.sch
+++ b/xschem/user_analog_project_wrapper.sch
@@ -24,13 +24,103 @@
 N 120 -1000 140 -1000 {
 lab=gpio_analog[8]}
 N 120 -980 140 -980 {
-lab=io_analog[6]}
+lab=#net1}
 N 440 -1020 480 -1020 {
 lab=gpio_noesd[0]}
 N 440 -1000 480 -1000 {
-lab=vdda1}
+lab=vccd1}
 N 440 -980 480 -980 {
 lab=vssa1}
+N 174.9 -149.73 174.9 -114.37 {
+lab=#net2}
+N 40.6 -480.4 78.7 -480.4 {
+lab=#net3}
+N 424.7 -510.6 487.9 -510.6 {
+lab=#net4}
+N 160 -661 160 -580 {
+lab=#net5}
+N 215 -620 215 -581 {
+lab=gpio_analog[0]}
+N 235 -620 235 -581 {
+lab=gpio_analog[1]}
+N 255 -620 255 -581 {
+lab=gpio_analog[2]}
+N 275 -620 275 -581 {
+lab=gpio_analog[3]}
+N 1070 -1119 1070 -1059 {
+lab=vssa1}
+N 1070 -1119 1090 -1119 {
+lab=vssa1}
+N 1090 -1119 1090 -1059 {
+lab=vssa1}
+N 1080 -1219 1080 -1119 {
+lab=vssa1}
+N 1070 -939 1070 -879 {
+lab=vccd1}
+N 1070 -879 1090 -879 {
+lab=vccd1}
+N 1090 -939 1090 -879 {
+lab=vccd1}
+N 1080 -879 1080 -819 {
+lab=vccd1}
+N 1630 -1119 1630 -1049 {
+lab=vssa1}
+N 1630 -1119 1650 -1119 {
+lab=vssa1}
+N 1650 -1119 1650 -1049 {
+lab=vssa1}
+N 1640 -1199 1640 -1119 {
+lab=vssa1}
+N 1640 -1219 1640 -1199 {
+lab=vssa1}
+N 1630 -929 1630 -879 {
+lab=vccd1}
+N 1630 -879 1650 -879 {
+lab=vccd1}
+N 1650 -929 1650 -879 {
+lab=vccd1}
+N 1640 -879 1640 -819 {
+lab=vccd1}
+N 1510 -989 1570 -989 {
+lab=io_in[13]}
+N 1730 -989 1770 -989 {
+lab=gpio_noesd[2]}
+N 1770 -989 1810 -989 {
+lab=gpio_noesd[2]}
+N 1510 -959 1570 -959 {
+lab=vin_2_com}
+N 1510 -1019 1570 -1019 {
+lab=vin_1_com}
+N 1160 -999 1230 -999 {
+lab=gpio_noesd[1]}
+N 910 -1019 1000 -1019 {
+lab=vin_1_ota}
+N 910 -979 1000 -979 {
+lab=vin_2_ota}
+N 874.9 -154.73 874.9 -119.37 {
+lab=#net6}
+N 740.6 -485.4 778.7 -485.4 {
+lab=#net7}
+N 1124.7 -515.6 1187.9 -515.6 {
+lab=#net8}
+N 860 -666 860 -585 {
+lab=#net9}
+N 915 -625 915 -586 {
+lab=gpio_analog[0]}
+N 935 -625 935 -586 {
+lab=gpio_analog[1]}
+N 955 -625 955 -586 {
+lab=gpio_analog[2]}
+N 975 -625 975 -586 {
+lab=gpio_analog[3]}
+N 424 -491 488 -491 {
+lab=vin_1_ota}
+N 1124 -496 1188 -496 {
+lab=vin_2_ota}
+N 425 -471 488 -471 {
+lab=vin_1_com}
+N 1124 -476 1188 -476 {
+lab=vin_2_com}
 C {devices/lab_pin.sym} -430 -540 2 0 {name=l1 lab=io_analog[1]}
 C {devices/lab_pin.sym} -510 -540 0 0 {name=l2 lab=io_analog[0]}
 C {devices/lab_pin.sym} -580 -380 0 0 {name=l3 lab=io_analog[4]}
@@ -77,13 +167,60 @@
 C {devices/lab_pin.sym} -610 -990 0 0 {name=l21 lab=io_analog[8]}
 C {devices/lab_pin.sym} -480 -1080 1 0 {name=l22 lab=io_analog[10]}
 C {C4.sym} 290 -1000 0 0 {name=x5}
-C {devices/lab_pin.sym} 480 -1000 0 1 {name=l23 sig_type=std_logic lab=vdda1}
+C {devices/lab_pin.sym} 480 -1000 0 1 {name=l23 sig_type=std_logic lab=vccd1}
 C {devices/lab_pin.sym} 480 -980 0 1 {name=l24 sig_type=std_logic lab=vssa1
 }
-C {devices/lab_pin.sym} 120 -980 0 0 {name=l26 sig_type=std_logic lab=io_analog[6]
-}
 C {devices/lab_pin.sym} 120 -1020 0 0 {name=l27 sig_type=std_logic lab=gpio_analog[7]
 }
 C {devices/lab_pin.sym} 120 -1000 0 0 {name=l25 sig_type=std_logic lab=gpio_analog[8]
 }
 C {devices/lab_pin.sym} 480 -1020 2 0 {name=l28 sig_type=std_logic lab=gpio_noesd[0]}
+C {amux.sym} 260.1 -356.1 0 0 {name=x2}
+C {devices/lab_pin.sym} 160.12 -660.6099999999999 3 1 {name=l7 sig_type=std_logic lab=vccd1}
+C {devices/lab_pin.sym} 174.64 -114.63 0 0 {name=l8 sig_type=std_logic lab=vssa1}
+C {devices/lab_pin.sym} 40.49999999999996 -480.55 0 0 {name=l10 sig_type=std_logic lab=io_analog[6]
+}
+C {devices/lab_pin.sym} 487.9 -510.3 0 1 {name=l11 sig_type=std_logic lab=C4_in}
+C {devices/lab_pin.sym} 119.9 -979.4000000000001 0 0 {name=l12 sig_type=std_logic lab=C4_in}
+C {devices/lab_pin.sym} 215 -620 1 0 {name=l13 sig_type=std_logic lab=gpio_analog[0]}
+C {devices/lab_pin.sym} 235 -620 1 0 {name=l14 sig_type=std_logic lab=gpio_analog[1]}
+C {devices/lab_pin.sym} 255 -620 1 0 {name=l15 sig_type=std_logic lab=gpio_analog[2]}
+C {devices/lab_pin.sym} 275 -620 1 0 {name=l16 sig_type=std_logic lab=gpio_analog[3]}
+C {sky130_sc_ams__ota_1.sym} 1080 -999 0 0 {name=x3}
+C {sky130_sc_ams__comparator_1.sym} 1640 -989 0 0 {name=x6}
+C {devices/lab_pin.sym} 1080 -1219 0 0 {name=l17 sig_type=std_logic lab=vssa1}
+C {devices/lab_pin.sym} 1080 -819 0 0 {name=l18 sig_type=std_logic lab=vccd1
+}
+C {devices/lab_pin.sym} 1640 -819 0 0 {name=l26 sig_type=std_logic lab=vccd1}
+C {devices/lab_pin.sym} 1640 -1219 0 0 {name=l29 sig_type=std_logic lab=vssa1
+}
+C {devices/lab_pin.sym} 1510 -989 0 0 {name=l30 sig_type=std_logic lab=io_in[13]
+}
+C {devices/lab_pin.sym} 1510 -1019 0 0 {name=l32 sig_type=std_logic lab=vin_1_com
+}
+C {devices/lab_pin.sym} 1188 -476 0 1 {name=l33 sig_type=std_logic lab=vin_2_com
+}
+C {devices/lab_pin.sym} 1230 -999 2 0 {name=l34 sig_type=std_logic lab=gpio_noesd[1]}
+C {amux.sym} 960.0999999999999 -361.1 0 0 {name=x7}
+C {devices/lab_pin.sym} 860.12 -665.6099999999999 3 1 {name=l37 sig_type=std_logic lab=vccd1}
+C {devices/lab_pin.sym} 874.64 -119.63 0 0 {name=l38 sig_type=std_logic lab=vssa1}
+C {devices/lab_pin.sym} 740.5 -485.55 0 0 {name=l39 sig_type=std_logic lab=io_analog[7]
+}
+C {devices/lab_pin.sym} 1187.9 -515.3 0 1 {name=l40 sig_type=std_logic lab=C4_in}
+C {devices/lab_pin.sym} 915 -625 1 0 {name=l41 sig_type=std_logic lab=gpio_analog[0]}
+C {devices/lab_pin.sym} 935 -625 1 0 {name=l42 sig_type=std_logic lab=gpio_analog[1]}
+C {devices/lab_pin.sym} 955 -625 1 0 {name=l43 sig_type=std_logic lab=gpio_analog[2]}
+C {devices/lab_pin.sym} 975 -625 1 0 {name=l44 sig_type=std_logic lab=gpio_analog[3]}
+C {devices/lab_pin.sym} 1810 -989 2 0 {name=l31 sig_type=std_logic lab=gpio_noesd[2]}
+C {devices/lab_pin.sym} 488 -491 0 1 {name=l45 sig_type=std_logic lab=vin_1_ota
+}
+C {devices/lab_pin.sym} 1188 -496 0 1 {name=l46 sig_type=std_logic lab=vin_2_ota
+}
+C {devices/lab_pin.sym} 910 -1019 0 0 {name=l35 sig_type=std_logic lab=vin_1_ota
+}
+C {devices/lab_pin.sym} 910 -979 0 0 {name=l36 sig_type=std_logic lab=vin_2_ota
+}
+C {devices/lab_pin.sym} 488 -471 0 1 {name=l47 sig_type=std_logic lab=vin_1_com
+}
+C {devices/lab_pin.sym} 1510 -959 0 0 {name=l48 sig_type=std_logic lab=vin_2_com
+}