diff --git a/gds/user_analog_project_wrapper.gds.gz b/gds/user_analog_project_wrapper.gds.gz
index b8e6825..4ed8ee1 100644
--- a/gds/user_analog_project_wrapper.gds.gz
+++ b/gds/user_analog_project_wrapper.gds.gz
Binary files differ
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index a7a9b8e..02642aa 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1654665543
+timestamp 1654700975
 << dnwell >>
 rect 237967 654480 254385 659516
 << nwell >>
@@ -165,6 +165,13 @@
 rect 582547 536319 582553 536383
 rect 582617 536319 582623 536383
 rect 582547 536313 582623 536319
+rect 2534 514428 3363 514438
+rect 2534 514418 2544 514428
+rect 2411 513766 2544 514418
+rect 3353 514418 3363 514428
+rect 3353 513766 3418 514418
+rect 2411 506084 3418 513766
+rect 2412 167769 3417 506084
 rect 252807 427783 253013 427822
 rect 252747 427676 253013 427783
 rect 252807 425753 253013 427676
@@ -172,6 +179,16 @@
 rect 250978 425412 250988 425744
 rect 251371 425412 253013 425744
 rect 250978 425403 253013 425412
+rect 2412 167613 10290 167769
+rect 2412 167602 3417 167613
+rect 8165 167172 9117 167182
+rect 8165 167095 8175 167172
+rect 8252 167095 9117 167172
+rect 8165 167085 9117 167095
+rect 13844 167048 13917 167058
+rect 13844 166995 13854 167048
+rect 13907 166995 13917 167048
+rect 13844 166985 13917 166995
 << via1 >>
 rect 561216 686254 561378 686400
 rect 561216 685764 561378 685910
@@ -202,7 +219,11 @@
 rect 582311 536318 582375 536382
 rect 582432 536319 582496 536383
 rect 582553 536319 582617 536383
+rect 2544 513766 3353 514428
 rect 250988 425412 251371 425744
+rect 13846 167762 13899 167815
+rect 8175 167095 8252 167172
+rect 13854 166995 13907 167048
 << metal2 >>
 rect 512622 703358 513362 703376
 rect 415430 703206 416162 703216
@@ -331,6 +352,21 @@
 rect 252693 656995 252703 657078
 rect 252372 656984 252703 656995
 rect 213548 656632 242148 656700
+rect 898 635888 3366 635898
+rect 898 634978 909 635888
+rect 1330 635148 3366 635888
+rect 898 634578 908 634978
+rect 1330 634889 3364 635148
+rect 898 634577 909 634578
+rect 1330 634577 3362 634889
+rect 898 634568 3362 634577
+rect 2517 634504 3362 634568
+rect 2537 514438 3362 634504
+rect 2534 514428 3362 514438
+rect 2534 513766 2544 514428
+rect 3353 513766 3362 514428
+rect 2534 513757 3362 513766
+rect 2534 513756 3336 513757
 rect 4346 511652 4478 511670
 rect 213548 511652 213616 656632
 rect 242068 656626 242148 656632
@@ -433,6 +469,13 @@
 rect 38 295430 48 295522
 rect 470 295430 226769 295522
 rect 38 295420 226769 295430
+rect 1 251328 12266 251341
+rect 0 251318 12266 251328
+rect 0 251226 10 251318
+rect 470 251226 12266 251318
+rect 0 251216 12266 251226
+rect 1 251209 12266 251216
+rect 12136 168194 12264 251209
 rect 573064 217110 574377 546500
 rect 581942 451020 582055 551689
 rect 582183 536382 582265 536393
@@ -487,6 +530,33 @@
 rect 581972 182956 582448 182970
 rect 583206 182956 583226 184272
 rect 581972 182936 583226 182956
+rect 12136 168066 13933 168194
+rect 13805 167815 13933 168066
+rect 13805 167762 13846 167815
+rect 13899 167762 13933 167815
+rect 13805 167732 13933 167762
+rect 16468 167421 16580 167429
+rect 15741 167309 16580 167421
+rect 8165 167172 8262 167182
+rect 8165 167095 8175 167172
+rect 8252 167095 8262 167172
+rect 8165 167085 8262 167095
+rect 13694 167075 13847 167076
+rect 13694 167048 13955 167075
+rect 13694 166995 13854 167048
+rect 13907 166995 13955 167048
+rect 13694 166383 13955 166995
+rect 13694 166230 13959 166383
+rect 13694 123720 13957 166230
+rect 0 123696 13957 123720
+rect 0 123604 10 123696
+rect 470 123604 13957 123696
+rect 0 123567 13957 123604
+rect 16468 80484 16580 167309
+rect 0 80474 16580 80484
+rect 0 80382 10 80474
+rect 470 80382 16580 80474
+rect 0 80372 16580 80382
 rect 524 -800 636 480
 rect 1706 -800 1818 480
 rect 2888 -800 3000 480
@@ -999,6 +1069,9 @@
 rect 512642 686570 513342 687270
 rect 512642 684870 513342 685570
 rect 582730 681176 583036 681526
+rect 909 634978 1330 635888
+rect 908 634578 1330 634978
+rect 909 634577 1330 634578
 rect 340 511530 480 511642
 rect 572978 656137 574376 656293
 rect 582847 641800 583161 642128
@@ -1010,12 +1083,16 @@
 rect 372 381870 475 381971
 rect 174 338652 470 338744
 rect 48 295430 470 295522
+rect 10 251226 470 251318
 rect 581952 450910 582044 451002
 rect 583552 405320 583616 405384
 rect 583548 358898 583612 358962
 rect 583548 313679 583612 313743
 rect 583547 269256 583611 269320
 rect 582448 182956 583206 184272
+rect 8175 167095 8252 167172
+rect 10 123604 470 123696
+rect 10 80382 470 80474
 << metal3 >>
 rect 16194 702300 21194 704800
 rect 68194 702300 73194 704800
@@ -1104,7 +1181,12 @@
 rect 49246 657502 51856 657602
 rect 51982 657502 54048 657602
 rect -800 643842 1660 648642
-rect -800 633842 1660 638642
+rect -800 635888 1660 638642
+rect -800 634978 909 635888
+rect -800 634578 908 634978
+rect -800 634577 909 634578
+rect 1330 634577 1660 635888
+rect -800 633842 1660 634577
 rect -800 564240 1660 564242
 rect 49246 564240 54048 657502
 rect 572968 656293 574389 656456
@@ -1177,7 +1259,10 @@
 rect -800 290692 480 290804
 rect -800 289510 480 289622
 rect -800 252398 480 252510
-rect -800 251216 480 251328
+rect -800 251318 480 251328
+rect -800 251226 10 251318
+rect 470 251226 480 251318
+rect -800 251216 480 251226
 rect -800 250034 480 250146
 rect -800 248852 480 248964
 rect -800 247670 480 247782
@@ -1267,11 +1352,19 @@
 rect 572970 182899 584800 182956
 rect 582340 181430 584800 182899
 rect -800 172888 1660 177688
-rect -800 162888 1660 167688
+rect -800 167192 1660 167688
+rect -800 167172 8272 167192
+rect -800 167095 8175 167172
+rect 8252 167095 8272 167172
+rect -800 167075 8272 167095
+rect -800 162888 1660 167075
 rect 582340 146830 584800 151630
 rect 582340 136830 584800 141630
 rect -800 124776 480 124888
-rect -800 123594 480 123706
+rect -800 123696 480 123706
+rect -800 123604 10 123696
+rect 470 123604 480 123696
+rect -800 123594 480 123604
 rect -800 122412 480 122524
 rect -800 121230 480 121342
 rect -800 120048 480 120160
@@ -1281,7 +1374,10 @@
 rect 583520 92754 584800 92866
 rect 583520 91572 584800 91684
 rect -800 81554 480 81666
-rect -800 80372 480 80484
+rect -800 80474 480 80484
+rect -800 80382 10 80474
+rect 470 80382 480 80474
+rect -800 80372 480 80382
 rect -800 79190 480 79302
 rect -800 78008 480 78120
 rect -800 76826 480 76938
@@ -1369,6 +1465,10 @@
 timestamp 1654556429
 transform 1 0 246083 0 1 656700
 box -398 -153 6394 687
+use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_1
+timestamp 1654556429
+transform 1 0 9447 0 1 167134
+box -398 -153 6394 687
 << labels >>
 flabel metal3 s 582300 677984 584800 682984 0 FreeSans 1120 0 0 0 io_analog[0]
 port 36 nsew signal bidirectional
diff --git a/netgen/user_analog_project_wrapper.spice b/netgen/user_analog_project_wrapper.spice
index 19d739f..7e5cda0 100644
--- a/netgen/user_analog_project_wrapper.spice
+++ b/netgen/user_analog_project_wrapper.spice
@@ -93,6 +93,7 @@
 x5 gpio_analog[7] gpio_analog[8] io_analog[6] net1 vccd1 vssd1 C4
 x3 vccd1 vccd1 vssd1 vssd1 net1 gpio_noesd[4] gpio_noesd[4] sky130_sc_ams__ota_1
 x8 gpio_analog[10] net3 net2 gpio_analog[11] gpio_analog[12] gpio_analog[9] hv_tgate
+x2 vccd2 vccd2 vssd2 vssd2 gpio_noesd[13] gpio_noesd[14] gpio_noesd[15] sky130_sc_ams__ota_1
 .ends
 
 
diff --git a/xschem/user_analog_project_wrapper.sch b/xschem/user_analog_project_wrapper.sch
index 65bcd4d..e564396 100644
--- a/xschem/user_analog_project_wrapper.sch
+++ b/xschem/user_analog_project_wrapper.sch
@@ -67,6 +67,22 @@
 lab=#net3}
 N 327 -322 327 -291 {
 lab=gpio_analog[10]}
+N 1070 -319 1070 -259 {
+lab=vssd1}
+N 1070 -259 1090 -259 {
+lab=vssd1}
+N 1090 -319 1090 -259 {
+lab=vssd1}
+N 1080 -259 1080 -199 {
+lab=vssd1}
+N 1070 -499 1070 -439 {
+lab=vccd2}
+N 1070 -499 1090 -499 {
+lab=vccd2}
+N 1090 -499 1090 -439 {
+lab=vccd2}
+N 1080 -599 1080 -499 {
+lab=vccd2}
 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]}
@@ -132,5 +148,12 @@
 C {devices/lab_pin.sym} 437 -372 2 0 {name=l54 sig_type=std_logic lab=gpio_analog[12]}
 C {devices/lab_pin.sym} 1080 -1219 0 0 {name=l55 sig_type=std_logic lab=vccd1
 }
-C {devices/lab_pin.sym} 910 -979 2 1 {name=l7 sig_type=std_logic lab=gpio_noesd[4]}
 C {devices/lab_pin.sym} 120 -980 0 0 {name=l8 sig_type=std_logic lab=io_analog[6]}
+C {sky130_sc_ams__ota_1.sym} 1080 -379 0 0 {name=x2}
+C {devices/lab_pin.sym} 1080 -199 0 0 {name=l10 sig_type=std_logic lab=vssd2}
+C {devices/lab_pin.sym} 1080 -599 0 0 {name=l11 sig_type=std_logic lab=vccd2
+}
+C {devices/lab_pin.sym} 910 -979 2 1 {name=l7 sig_type=std_logic lab=gpio_noesd[4]}
+C {devices/lab_pin.sym} 1000 -399 0 0 {name=l12 sig_type=std_logic lab=gpio_noesd[13]}
+C {devices/lab_pin.sym} 1000 -359 0 0 {name=l13 sig_type=std_logic lab=gpio_noesd[14]}
+C {devices/lab_pin.sym} 1160 -379 0 1 {name=l14 sig_type=std_logic lab=gpio_noesd[15]}