diff --git a/gds/user_analog_project_wrapper.gds.gz b/gds/user_analog_project_wrapper.gds.gz
index 4ed8ee1..ad19adb 100644
--- a/gds/user_analog_project_wrapper.gds.gz
+++ b/gds/user_analog_project_wrapper.gds.gz
Binary files differ
diff --git a/mag/C4.mag b/mag/C4.mag
index 39c2e34..e376d0f 100644
--- a/mag/C4.mag
+++ b/mag/C4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1654659034
+timestamp 1654715540
 << nwell >>
 rect 38 421 240 596
 rect 18 166 220 421
diff --git a/mag/sky130_sc_ams__ota_1.mag b/mag/sky130_sc_ams__ota_1.mag
index 4185189..908971b 100644
--- a/mag/sky130_sc_ams__ota_1.mag
+++ b/mag/sky130_sc_ams__ota_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1654556429
+timestamp 1654715540
 << nwell >>
 rect -398 414 6394 687
 rect -398 339 3942 414
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 02642aa..efa6508 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,48 +1,10 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1654700975
-<< dnwell >>
-rect 237967 654480 254385 659516
-<< nwell >>
-rect 237887 659310 254465 659596
-rect 237887 654686 238173 659310
-rect 254179 654686 254465 659310
-rect 237887 654400 254465 654686
-<< nsubdiff >>
-rect 237924 659539 254428 659559
-rect 237924 659505 238004 659539
-rect 254348 659505 254428 659539
-rect 237924 659485 254428 659505
-rect 237924 659479 237998 659485
-rect 237924 654517 237944 659479
-rect 237978 654517 237998 659479
-rect 237924 654511 237998 654517
-rect 254354 659479 254428 659485
-rect 254354 654517 254374 659479
-rect 254408 654517 254428 659479
-rect 254354 654511 254428 654517
-rect 237924 654491 254428 654511
-rect 237924 654457 238004 654491
-rect 254348 654457 254428 654491
-rect 237924 654437 254428 654457
-<< nsubdiffcont >>
-rect 238004 659505 254348 659539
-rect 237944 654517 237978 659479
-rect 254374 654517 254408 659479
-rect 238004 654457 254348 654491
-<< locali >>
-rect 237944 659505 238004 659539
-rect 254348 659505 254408 659539
-rect 237944 659479 237978 659505
-rect 254374 659479 254408 659505
-rect 237944 654491 237978 654517
-rect 254374 654491 254408 654517
-rect 237944 654457 238004 654491
-rect 254348 654457 254408 654491
+timestamp 1654721934
 << viali >>
-rect 243709 657061 243743 657095
-rect 250501 656568 250535 656603
+rect 531009 283461 531043 283495
+rect 537801 282968 537835 283003
 << metal1 >>
 rect 141506 696318 582623 696394
 rect 141697 696214 582502 696290
@@ -98,73 +60,11 @@
 rect 51839 657600 52002 660998
 rect 51839 657502 51858 657600
 rect 51982 657502 52002 657600
-rect 263241 658791 263424 658801
-rect 263241 658463 263251 658791
-rect 263414 658463 263424 658791
 rect 51839 657487 52002 657502
-rect 244667 657539 245819 657542
-rect 244667 657524 248533 657539
-rect 263241 657524 263424 658463
-rect 244667 657449 263424 657524
-rect 243532 657418 263424 657449
-rect 243532 657404 248533 657418
-rect 243532 657329 245819 657404
-rect 244666 657196 245819 657329
-rect 244667 657194 245819 657196
-rect 243683 657108 243763 657118
-rect 243683 657048 243693 657108
-rect 243753 657048 243763 657108
-rect 243683 657038 243763 657048
-rect 252522 657078 582055 657088
-rect 252522 656995 252532 657078
-rect 252693 656995 582055 657078
-rect 252522 656985 582055 656995
-rect 243243 656795 243315 656801
-rect 243243 656735 243249 656795
-rect 243309 656735 243315 656795
-rect 243243 656729 243315 656735
-rect 244665 656697 245729 656748
-rect 244665 656624 245790 656697
-rect 243327 656520 245790 656624
-rect 250481 656611 250555 656623
-rect 250481 656557 250490 656611
-rect 250544 656557 250555 656611
-rect 250481 656548 250555 656557
-rect 244665 656453 245790 656520
-rect 573060 656453 574329 656454
-rect 244665 656443 574386 656453
-rect 244665 656337 572978 656443
-rect 574376 656337 574386 656443
-rect 244665 656327 574386 656337
-rect 244665 656325 245729 656327
-rect 573060 548412 574329 656327
-rect 581952 551915 582055 656985
-rect 581942 551868 582056 551915
-rect 581942 551782 582055 551868
-rect 581942 551689 581952 551782
-rect 582045 551689 582055 551782
-rect 581942 551679 582055 551689
-rect 573060 548053 574368 548412
-rect 573058 547773 574371 548053
-rect 573058 546500 573078 547773
-rect 574351 546500 574371 547773
-rect 573058 546480 574371 546500
-rect 582187 536382 582263 696005
-rect 582187 536318 582193 536382
-rect 582257 536318 582263 536382
-rect 582187 536312 582263 536318
-rect 582305 536382 582381 696110
-rect 582305 536318 582311 536382
-rect 582375 536318 582381 536382
-rect 582305 536312 582381 536318
-rect 582426 536383 582502 696214
-rect 582426 536319 582432 536383
-rect 582496 536319 582502 536383
-rect 582426 536313 582502 536319
-rect 582547 536383 582623 696318
-rect 582547 536319 582553 536383
-rect 582617 536319 582623 536383
-rect 582547 536313 582623 536319
+rect 582187 657401 582263 696005
+rect 582305 657401 582381 696110
+rect 582426 657401 582502 696214
+rect 582547 657401 582623 696318
 rect 2534 514428 3363 514438
 rect 2534 514418 2544 514428
 rect 2411 513766 2544 514418
@@ -179,6 +79,33 @@
 rect 250978 425412 250988 425744
 rect 251371 425412 253013 425744
 rect 250978 425403 253013 425412
+rect 531967 283922 533119 283942
+rect 531967 283849 531987 283922
+rect 530832 283729 531987 283849
+rect 531966 283615 531987 283729
+rect 533099 283615 533119 283922
+rect 531966 283596 533119 283615
+rect 531967 283594 533119 283596
+rect 530983 283508 531063 283518
+rect 530983 283448 530993 283508
+rect 531053 283448 531063 283508
+rect 530983 283438 531063 283448
+rect 530543 283195 530615 283201
+rect 530543 283136 530549 283195
+rect 530610 283136 530615 283195
+rect 530543 283129 530615 283136
+rect 531965 283024 533029 283148
+rect 530627 282920 533029 283024
+rect 537781 283011 537855 283023
+rect 537781 282957 537790 283011
+rect 537844 282957 537855 283011
+rect 537781 282948 537855 282957
+rect 531965 282904 533029 282920
+rect 531965 282730 531975 282904
+rect 533000 282853 533029 282904
+rect 533000 282730 533030 282853
+rect 531965 282727 533030 282730
+rect 531965 282725 533029 282727
 rect 2412 167613 10290 167769
 rect 2412 167602 3417 167613
 rect 8165 167172 9117 167182
@@ -198,29 +125,22 @@
 rect 43042 663434 43190 663602
 rect 56256 663434 56376 663594
 rect 51858 657502 51982 657600
-rect 263251 658463 263414 658791
-rect 250483 657328 250536 657380
-rect 243693 657095 243753 657108
-rect 243693 657061 243709 657095
-rect 243709 657061 243743 657095
-rect 243743 657061 243753 657095
-rect 243693 657048 243753 657061
-rect 252532 656995 252693 657078
-rect 243249 656735 243309 656795
-rect 250490 656603 250544 656611
-rect 250490 656568 250501 656603
-rect 250501 656568 250535 656603
-rect 250535 656568 250544 656603
-rect 250490 656557 250544 656568
-rect 572978 656337 574376 656443
-rect 581952 551689 582045 551782
-rect 573078 546500 574351 547773
-rect 582193 536318 582257 536382
-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 531987 283615 533099 283922
+rect 537783 283728 537836 283780
+rect 530993 283495 531053 283508
+rect 530993 283461 531009 283495
+rect 531009 283461 531043 283495
+rect 531043 283461 531053 283495
+rect 530993 283448 531053 283461
+rect 530549 283136 530610 283195
+rect 537790 283003 537844 283011
+rect 537790 282968 537801 283003
+rect 537801 282968 537835 283003
+rect 537835 282968 537844 283003
+rect 537790 282957 537844 282968
+rect 531975 282730 533000 282904
 rect 13846 167762 13899 167815
 rect 8175 167095 8252 167172
 rect 13854 166995 13907 167048
@@ -231,26 +151,6 @@
 rect 416152 702616 416162 703206
 rect 415430 702606 416162 702616
 rect 467610 703066 468342 703076
-rect 173176 699283 173258 699292
-rect 173176 699219 173185 699283
-rect 173249 699219 173258 699283
-rect 51436 666500 51710 666510
-rect 51436 666332 51446 666500
-rect 51700 666332 51710 666500
-rect 51436 666322 51710 666332
-rect 43032 663602 43200 663612
-rect 43032 663434 43042 663602
-rect 43190 663434 43200 663602
-rect 43032 663424 43200 663434
-rect 56246 663594 56386 663604
-rect 56246 663434 56256 663594
-rect 56376 663434 56386 663594
-rect 56246 663424 56386 663434
-rect 51838 657602 52004 657616
-rect 51838 657502 51856 657602
-rect 51982 657502 52004 657602
-rect 51838 657486 52004 657502
-rect 173176 657436 173258 699219
 rect 224634 698474 225366 698484
 rect 224634 697884 224644 698474
 rect 225356 697884 225366 698474
@@ -334,24 +234,22 @@
 rect 583036 681176 583046 681526
 rect 562127 681170 583046 681176
 rect 582202 681166 583046 681170
-rect 173176 657361 241631 657436
-rect 250459 657380 250559 657402
-rect 250459 657328 250483 657380
-rect 250536 657328 250559 657380
-rect 242068 657108 243812 657184
-rect 242068 657104 243693 657108
-rect 242068 656700 242148 657104
-rect 243682 657048 243693 657104
-rect 243753 657048 243812 657108
-rect 250459 657073 250559 657328
-rect 243682 657038 243812 657048
-rect 244682 656973 250559 657073
-rect 252372 657089 252436 657157
-rect 252372 657078 252703 657089
-rect 252372 656995 252532 657078
-rect 252693 656995 252703 657078
-rect 252372 656984 252703 656995
-rect 213548 656632 242148 656700
+rect 51436 666500 51710 666510
+rect 51436 666332 51446 666500
+rect 51700 666332 51710 666500
+rect 51436 666322 51710 666332
+rect 43032 663602 43200 663612
+rect 43032 663434 43042 663602
+rect 43190 663434 43200 663602
+rect 43032 663424 43200 663434
+rect 56246 663594 56386 663604
+rect 56246 663434 56256 663594
+rect 56376 663434 56386 663594
+rect 56246 663424 56386 663434
+rect 51838 657602 52004 657616
+rect 51838 657502 51856 657602
+rect 51982 657502 52004 657602
+rect 51838 657486 52004 657502
 rect 898 635888 3366 635898
 rect 898 634978 909 635888
 rect 1330 635148 3366 635888
@@ -362,69 +260,50 @@
 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
-rect 243228 656795 243318 656811
-rect 243228 656735 243249 656795
-rect 243309 656735 243318 656795
-rect 243228 656466 243318 656735
-rect 252372 656623 252436 656984
-rect 250481 656611 252436 656623
-rect 250481 656557 250490 656611
-rect 250544 656557 252436 656611
-rect 250481 656547 252436 656557
-rect 340 511642 213616 511652
-rect 480 511530 213616 511642
-rect 340 511508 213616 511530
-rect 213902 656386 243318 656466
-rect 213902 468414 213982 656386
-rect 261362 581646 262080 681000
-rect 263241 658791 581855 658801
-rect 263241 658463 263251 658791
-rect 263414 658463 581855 658791
-rect 263241 658453 581855 658463
-rect 572968 656443 574386 656453
-rect 572968 656337 572978 656443
-rect 574376 656337 574386 656443
-rect 572968 656293 574386 656337
-rect 572968 656137 572978 656293
-rect 574376 656137 574386 656293
-rect 572968 656127 574386 656137
-rect 581507 642138 581855 658453
-rect 581507 642128 583171 642138
-rect 581507 641800 582847 642128
-rect 583161 641800 583171 642128
-rect 581507 641790 583171 641800
+rect 261362 615323 262080 681000
+rect 531988 633060 583933 633070
+rect 531988 632030 582893 633060
+rect 583923 632030 583933 633060
+rect 531988 632020 583933 632030
+rect 261362 581646 262080 615247
 rect 261362 581378 262072 581646
 rect 261362 579878 262074 581378
 rect 261365 554940 262072 579878
+rect 532007 556852 533019 632020
+rect 532007 555914 532017 556852
+rect 533010 555914 533019 556852
+rect 532007 555904 533019 555914
 rect 261365 554398 261420 554940
 rect 262020 554398 262072 554940
 rect 261365 554343 262072 554398
 rect 227322 553478 227510 553481
+rect 532007 553478 533019 553482
 rect 227322 553476 580792 553478
 rect 227322 553460 583264 553476
 rect 227322 552760 582550 553460
 rect 583250 552760 583264 553460
 rect 227322 552736 583264 552760
 rect 227322 552004 227946 552736
-rect 360 468404 213982 468414
-rect 462 468320 213982 468404
-rect 360 468310 213982 468320
+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 340 511642 180146 511652
+rect 480 511530 180146 511642
+rect 340 511508 180146 511530
+rect 360 468404 180146 468414
+rect 462 468320 180146 468404
+rect 360 468310 180146 468320
 rect 227325 428351 227943 552004
 rect 261360 551706 262080 551820
 rect 261360 551164 261434 551706
 rect 262034 551164 262080 551706
 rect 261360 549780 262080 551164
-rect 581942 551782 582055 551792
-rect 581942 551689 581952 551782
-rect 582045 551689 582055 551782
+rect 532007 550932 533019 551027
+rect 532007 549939 532017 550932
+rect 533010 549939 533019 550932
 rect 222907 427602 225194 427618
 rect 222907 427508 225371 427602
 rect 222907 427499 225194 427508
@@ -448,11 +327,12 @@
 rect 225043 338754 225176 427121
 rect 251643 426642 252354 427129
 rect 261364 426642 262077 549780
+rect 526839 432604 526950 432624
+rect 526839 432533 526859 432604
+rect 526930 432533 526950 432604
+rect 526839 432413 526950 432533
 rect 251643 425931 262077 426642
 rect 261364 425930 262077 425931
-rect 573064 547773 574377 547790
-rect 573064 546500 573078 547773
-rect 574351 546500 574377 547773
 rect 250770 425754 250880 425755
 rect 226412 425744 251381 425754
 rect 226412 425412 250988 425744
@@ -465,10 +345,79 @@
 rect 164 338642 225176 338652
 rect 38 295530 580 295532
 rect 226416 295530 226769 425394
+rect 526841 420691 526948 432413
 rect 38 295522 226769 295530
 rect 38 295430 48 295522
 rect 470 295430 226769 295522
 rect 38 295420 226769 295430
+rect 526846 283869 526943 420691
+rect 532007 291957 533019 549939
+rect 580478 358976 584000 359007
+rect 580478 358884 583530 358976
+rect 583990 358884 584000 358976
+rect 580478 358834 584000 358884
+rect 580479 291957 580600 358834
+rect 530528 291949 531682 291957
+rect 530528 291852 531552 291949
+rect 531671 291852 531682 291949
+rect 530528 291841 531682 291852
+rect 532006 291841 533022 291957
+rect 533346 291950 580600 291957
+rect 533346 291849 533355 291950
+rect 533473 291849 580600 291950
+rect 533346 291841 580600 291849
+rect 530528 284645 530644 291841
+rect 532007 291212 533019 291841
+rect 580479 291839 580600 291841
+rect 581228 313754 584000 313771
+rect 581228 313662 583530 313754
+rect 583990 313662 584000 313754
+rect 581228 313600 584000 313662
+rect 532008 291067 533019 291212
+rect 581228 291067 581379 313600
+rect 529964 284529 530644 284645
+rect 530967 291044 531681 291067
+rect 530967 290947 531542 291044
+rect 531661 290947 531681 291044
+rect 530967 290921 531681 290947
+rect 532008 290921 533021 291067
+rect 533346 291043 581379 291067
+rect 533346 290942 533388 291043
+rect 533506 290942 581379 291043
+rect 533346 290921 581379 290942
+rect 526846 283772 528992 283869
+rect 526849 283761 528992 283772
+rect 529964 283223 530080 284529
+rect 530967 283508 531113 290921
+rect 532008 290717 533019 290921
+rect 532007 284932 533019 290717
+rect 531977 283922 533109 284932
+rect 531977 283615 531987 283922
+rect 533099 283615 533109 283922
+rect 531977 283605 533109 283615
+rect 537759 283780 537859 283802
+rect 537759 283728 537783 283780
+rect 537836 283728 537859 283780
+rect 530967 283448 530993 283508
+rect 531053 283448 531113 283508
+rect 537759 283473 537859 283728
+rect 530967 283432 531113 283448
+rect 531982 283373 537859 283473
+rect 539672 283384 578107 283489
+rect 529964 283195 530634 283223
+rect 529964 283136 530549 283195
+rect 530610 283136 530634 283195
+rect 529964 283107 530634 283136
+rect 529964 283106 530080 283107
+rect 539672 283023 539736 283384
+rect 537781 283011 539736 283023
+rect 537781 282957 537790 283011
+rect 537844 282957 539736 283011
+rect 537781 282947 539736 282957
+rect 531965 282904 533010 282914
+rect 531965 282730 531975 282904
+rect 533000 282730 533010 282904
+rect 531965 281720 533010 282730
 rect 1 251328 12266 251341
 rect 0 251318 12266 251328
 rect 0 251226 10 251318
@@ -476,60 +425,16 @@
 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
-rect 582183 536318 582193 536382
-rect 582257 536318 582265 536382
-rect 581942 451002 582054 451020
-rect 581942 450910 581952 451002
-rect 582044 450910 582054 451002
-rect 581942 450900 582054 450910
-rect 582183 406392 582265 536318
-rect 582303 536382 582385 536393
-rect 582303 536318 582311 536382
-rect 582375 536318 582385 536382
-rect 582303 406392 582385 536318
-rect 582423 536383 582505 536393
-rect 582423 536319 582432 536383
-rect 582496 536319 582505 536383
-rect 582423 406392 582505 536319
-rect 582543 536383 582625 536393
-rect 582543 536319 582553 536383
-rect 582617 536319 582625 536383
-rect 582543 406393 582625 536319
-rect 582183 405310 582267 406392
-rect 582303 405310 582387 406392
-rect 582422 406312 582506 406392
-rect 582542 406312 582626 406393
-rect 582183 269329 582265 405310
-rect 582303 313752 582385 405310
-rect 582423 358971 582505 406312
-rect 582543 405393 582625 406312
-rect 582543 405384 583625 405393
-rect 582543 405320 583552 405384
-rect 583616 405320 583625 405384
-rect 582543 405311 583625 405320
-rect 582423 358962 583621 358971
-rect 582423 358898 583548 358962
-rect 583612 358898 583621 358962
-rect 582423 358889 583621 358898
-rect 582303 313743 583621 313752
-rect 582303 313679 583548 313743
-rect 583612 313679 583621 313743
-rect 582303 313670 583621 313679
-rect 582183 269320 583620 269329
-rect 582183 269256 583547 269320
-rect 583611 269256 583620 269320
-rect 582183 269248 583620 269256
-rect 573062 184286 574378 217110
-rect 582228 184290 583226 184292
-rect 581972 184286 583226 184290
-rect 573062 184272 583226 184286
-rect 573062 182970 582448 184272
-rect 581972 182956 582448 182970
-rect 583206 182956 583226 184272
-rect 581972 182936 583226 182956
+rect 531975 193883 532966 281720
+rect 578002 270525 578107 283384
+rect 578002 270515 584000 270525
+rect 578002 270420 583528 270515
+rect 583990 270420 584010 270515
+rect 578002 270410 584010 270420
+rect 531975 193873 583668 193883
+rect 531975 192902 582687 193873
+rect 583658 192902 583668 193873
+rect 531975 192892 583668 192902
 rect 12136 168066 13933 168194
 rect 13805 167815 13933 168066
 rect 13805 167762 13846 167815
@@ -1053,13 +958,6 @@
 rect 583250 -800 583362 480
 << via2 >>
 rect 415440 702616 416152 703206
-rect 173185 699219 173249 699283
-rect 51446 666332 51700 666500
-rect 43042 663434 43190 663602
-rect 56256 663434 56376 663594
-rect 51856 657600 51982 657602
-rect 51856 657502 51858 657600
-rect 51858 657502 51982 657600
 rect 224644 697884 225356 698474
 rect 326344 697884 327056 698474
 rect 467620 702476 468332 703066
@@ -1069,27 +967,37 @@
 rect 512642 686570 513342 687270
 rect 512642 684870 513342 685570
 rect 582730 681176 583036 681526
+rect 51446 666332 51700 666500
+rect 43042 663434 43190 663602
+rect 56256 663434 56376 663594
+rect 51856 657600 51982 657602
+rect 51856 657502 51858 657600
+rect 51858 657502 51982 657600
 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
+rect 582893 632030 583923 633060
+rect 532017 555914 533010 556852
 rect 261420 554398 262020 554940
 rect 582550 552760 583250 553460
+rect 340 511530 480 511642
 rect 360 468320 462 468404
 rect 261434 551164 262034 551706
+rect 532017 549939 533010 550932
 rect 396 425092 474 425192
 rect 372 381870 475 381971
+rect 526859 432533 526930 432604
 rect 174 338652 470 338744
 rect 48 295430 470 295522
+rect 583530 358884 583990 358976
+rect 531552 291852 531671 291949
+rect 533355 291849 533473 291950
+rect 583530 313662 583990 313754
+rect 531542 290947 531661 291044
+rect 533388 290942 533506 291043
 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 583528 270420 583990 270515
+rect 582687 192902 583658 193873
 rect 8175 167095 8252 167172
 rect 10 123604 470 123696
 rect 10 80382 470 80474
@@ -1135,23 +1043,11 @@
 rect 68196 695160 73195 702300
 rect 165596 701002 170590 702300
 rect 175896 701002 180890 702300
-rect 165556 699283 180890 701002
-rect 165556 699219 173185 699283
-rect 173249 699219 180890 699283
-rect 165556 698298 180890 699219
+rect 165556 698298 180890 701002
 rect 217296 699170 222286 702300
 rect 227598 699170 232588 702300
 rect 217296 698474 232588 699170
 rect 165556 698198 180868 698298
-rect 217296 697884 224644 698474
-rect 225356 697884 232588 698474
-rect 217296 697340 232588 697884
-rect 318994 699170 323986 702300
-rect 329298 699170 334288 702300
-rect 318994 698474 334288 699170
-rect 318994 697884 326344 698474
-rect 327056 697884 334288 698474
-rect 318994 697340 334288 697884
 rect -800 680242 44130 685242
 rect 39130 663602 44130 680242
 rect 49418 666500 54418 690290
@@ -1163,6 +1059,16 @@
 rect 43190 663434 44130 663602
 rect 39130 660904 44130 663434
 rect 56069 663594 61068 690161
+rect 173682 675152 173793 698198
+rect 217296 697884 224644 698474
+rect 225356 697884 232588 698474
+rect 217296 697340 232588 697884
+rect 318994 699170 323986 702300
+rect 329298 699170 334288 702300
+rect 318994 698474 334288 699170
+rect 318994 697884 326344 698474
+rect 327056 697884 334288 698474
+rect 318994 697340 334288 697884
 rect 512620 687270 513364 687278
 rect 512620 686570 512642 687270
 rect 513342 686570 513364 687270
@@ -1174,6 +1080,7 @@
 rect 582300 681176 582730 681526
 rect 583036 681176 584800 681526
 rect 582300 677984 584800 681176
+rect 173682 675041 526950 675152
 rect 56069 663434 56256 663594
 rect 56376 663434 61068 663594
 rect 56069 662793 61068 663434
@@ -1189,10 +1096,6 @@
 rect -800 633842 1660 634577
 rect -800 564240 1660 564242
 rect 49246 564240 54048 657502
-rect 572968 656293 574389 656456
-rect 572968 656137 572978 656293
-rect 574376 656137 574389 656293
-rect 572968 653284 574389 656137
 rect -800 559445 54048 564240
 rect -800 559442 1660 559445
 rect 49246 559441 54048 559445
@@ -1222,59 +1125,12 @@
 rect -800 464762 480 464874
 rect -800 463580 480 463692
 rect -800 462398 480 462510
-rect -800 425192 480 425198
-rect -800 425092 396 425192
-rect 474 425092 480 425192
-rect -800 425086 480 425092
-rect -800 423904 480 424016
-rect -800 422722 480 422834
-rect -800 421540 480 421652
-rect -800 420358 480 420470
-rect -800 419176 480 419288
-rect -800 381971 480 381976
-rect -800 381870 372 381971
-rect 475 381870 480 381971
-rect -800 381864 480 381870
-rect -800 380682 480 380794
-rect -800 379500 480 379612
-rect -800 378318 480 378430
-rect -800 377136 480 377248
-rect -800 375954 480 376066
-rect -800 338744 480 338754
-rect -800 338652 174 338744
-rect 470 338652 480 338744
-rect -800 338642 480 338652
-rect -800 337460 480 337572
-rect -800 336278 480 336390
-rect -800 335096 480 335208
-rect -800 333914 480 334026
-rect -800 332732 480 332844
-rect -800 295522 480 295532
-rect -800 295430 48 295522
-rect 470 295430 480 295522
-rect -800 295420 480 295430
-rect -800 294238 480 294350
-rect -800 293056 480 293168
-rect -800 291874 480 291986
-rect -800 290692 480 290804
-rect -800 289510 480 289622
-rect -800 252398 480 252510
-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
-rect -800 246488 480 246600
-rect -800 214888 1660 219688
-rect -800 204888 1660 209688
-rect 572969 198757 574386 653284
-rect 582340 642128 584800 644584
-rect 582340 641800 582847 642128
-rect 583161 641800 584800 642128
-rect 582340 639784 584800 641800
-rect 582340 629784 584800 634584
+rect 526839 432604 526950 675041
+rect 582340 639784 584800 644584
+rect 582340 633060 584800 634584
+rect 582340 632030 582893 633060
+rect 583923 632030 584800 633060
+rect 582340 629784 584800 632030
 rect 583520 589472 584800 589584
 rect 583520 588290 584800 588402
 rect 583510 587220 583742 587225
@@ -1283,11 +1139,18 @@
 rect 583520 585926 584800 586038
 rect 583520 584744 584800 584856
 rect 583520 583562 584800 583674
+rect 532007 556852 533020 556862
+rect 532007 555914 532017 556852
+rect 533010 555914 533020 556852
+rect 532007 550932 533020 555914
 rect 582339 553554 584800 555362
+rect 532007 549939 532017 550932
+rect 533010 549939 533020 550932
 rect 582340 553460 584800 553554
 rect 582340 552760 582550 553460
 rect 583250 552760 584800 553460
 rect 582340 550562 584800 552760
+rect 532007 549929 533020 549939
 rect 582340 540562 584800 545362
 rect 583520 500050 584800 500162
 rect 583520 498868 584800 498980
@@ -1299,58 +1162,113 @@
 rect 583520 454446 584800 454558
 rect 583520 453264 584800 453376
 rect 583520 452082 584800 452194
-rect 581942 451002 584800 451012
-rect 581942 450910 581952 451002
-rect 582044 450910 584800 451002
-rect 581942 450900 584800 450910
+rect 583520 450900 584800 451012
 rect 583520 449718 584800 449830
+rect 526839 432533 526859 432604
+rect 526930 432533 526950 432604
+rect 526839 432513 526950 432533
+rect -800 425192 480 425198
+rect -800 425092 396 425192
+rect 474 425092 480 425192
+rect -800 425086 480 425092
+rect -800 423904 480 424016
+rect -800 422722 480 422834
+rect -800 421540 480 421652
+rect -800 420358 480 420470
+rect -800 419176 480 419288
 rect 583520 411206 584800 411318
 rect 583520 410024 584800 410136
 rect 583520 408842 584800 408954
 rect 583520 407660 584800 407772
 rect 583520 406478 584800 406590
-rect 583520 405384 584800 405408
-rect 583520 405320 583552 405384
-rect 583616 405320 584800 405384
-rect 583520 405296 584800 405320
+rect 583520 405296 584800 405408
+rect -800 381971 480 381976
+rect -800 381870 372 381971
+rect 475 381870 480 381971
+rect -800 381864 480 381870
+rect -800 380682 480 380794
+rect -800 379500 480 379612
+rect -800 378318 480 378430
+rect -800 377136 480 377248
+rect -800 375954 480 376066
 rect 583520 364784 584800 364896
 rect 583520 363602 584800 363714
 rect 583520 362420 584800 362532
 rect 583520 361238 584800 361350
 rect 583520 360056 584800 360168
-rect 583520 358962 584800 358986
-rect 583520 358898 583548 358962
-rect 583612 358898 584800 358962
-rect 583520 358874 584800 358898
+rect 583520 358976 584800 358986
+rect 583520 358884 583530 358976
+rect 583990 358884 584800 358976
+rect 583520 358874 584800 358884
+rect -800 338744 480 338754
+rect -800 338652 174 338744
+rect 470 338652 480 338744
+rect -800 338642 480 338652
+rect -800 337460 480 337572
+rect -800 336278 480 336390
+rect -800 335096 480 335208
+rect -800 333914 480 334026
+rect -800 332732 480 332844
 rect 583520 319562 584800 319674
 rect 583520 318380 584800 318492
 rect 583520 317198 584800 317310
 rect 583520 316016 584800 316128
 rect 583520 314834 584800 314946
-rect 583520 313743 584800 313764
-rect 583520 313679 583548 313743
-rect 583612 313679 584800 313743
-rect 583520 313652 584800 313679
+rect 583520 313754 584800 313764
+rect 583520 313662 583530 313754
+rect 583990 313662 584800 313754
+rect 583520 313652 584800 313662
+rect -800 295522 480 295532
+rect -800 295430 48 295522
+rect 470 295430 480 295522
+rect -800 295420 480 295430
+rect -800 294238 480 294350
+rect -800 293056 480 293168
+rect -800 291874 480 291986
+rect 531530 291950 533493 291970
+rect 531530 291949 533355 291950
+rect 531530 291852 531552 291949
+rect 531671 291852 533355 291949
+rect 531530 291849 533355 291852
+rect 533473 291849 533493 291950
+rect 531530 291829 533493 291849
+rect 531502 291044 533544 291084
+rect 531502 290947 531542 291044
+rect 531661 291043 533544 291044
+rect 531661 290947 533388 291043
+rect 531502 290942 533388 290947
+rect 533506 290942 533544 291043
+rect 531502 290907 533544 290942
+rect 531528 290906 533544 290907
+rect -800 290692 480 290804
+rect -800 289510 480 289622
 rect 583520 275140 584800 275252
 rect 583520 273958 584800 274070
 rect 583520 272776 584800 272888
 rect 583520 271594 584800 271706
-rect 583520 270412 584800 270524
-rect 583520 269320 584800 269342
-rect 583520 269256 583547 269320
-rect 583611 269256 584800 269320
-rect 583520 269230 584800 269256
+rect 583520 270515 584800 270524
+rect 583520 270420 583528 270515
+rect 583990 270420 584800 270515
+rect 583520 270412 584800 270420
+rect 583520 269230 584800 269342
+rect -800 252398 480 252510
+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
+rect -800 246488 480 246600
 rect 582340 235230 584800 240030
 rect 582340 225230 584800 230030
-rect 572969 193001 574395 198757
-rect 572970 184324 574395 193001
-rect 582340 191430 584800 196230
-rect 582340 184324 584800 186230
-rect 572970 184272 584800 184324
-rect 572970 182956 582448 184272
-rect 583206 182956 584800 184272
-rect 572970 182899 584800 182956
-rect 582340 181430 584800 182899
+rect -800 214888 1660 219688
+rect -800 204888 1660 209688
+rect 582340 193873 584800 196230
+rect 582340 192902 582687 193873
+rect 583658 192902 584800 193873
+rect 582340 191430 584800 192902
+rect 582340 181430 584800 186230
 rect -800 172888 1660 177688
 rect -800 167192 1660 167688
 rect -800 167172 8272 167192
@@ -1450,8 +1368,8 @@
 transform 1 0 562058 0 1 685450
 box 0 0 864 800
 use C4  C4_0
-timestamp 1654659034
-transform 1 0 243509 0 1 656777
+timestamp 1654715540
+transform 1 0 530809 0 1 283177
 box -3132 -258 1273 678
 use FG_pfet  FG_pfet_0
 timestamp 1654453464
@@ -1462,11 +1380,11 @@
 transform 1 0 230448 0 1 427446
 box -5090 -470 22390 1062
 use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_0
-timestamp 1654556429
-transform 1 0 246083 0 1 656700
+timestamp 1654715540
+transform 1 0 533383 0 1 283100
 box -398 -153 6394 687
 use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_1
-timestamp 1654556429
+timestamp 1654715540
 transform 1 0 9447 0 1 167134
 box -398 -153 6394 687
 << labels >>
diff --git a/netgen/user_analog_project_wrapper.spice b/netgen/user_analog_project_wrapper.spice
index 7e5cda0..08ec263 100644
--- a/netgen/user_analog_project_wrapper.spice
+++ b/netgen/user_analog_project_wrapper.spice
@@ -90,8 +90,8 @@
 + user_irq[2] user_irq[1] user_irq[0]
 x1 io_analog[4] io_analog[5] io_analog[1] io_analog[2] io_analog[3] io_analog[0] vssa1 1T1R_2x2
 x4 io_analog[10] io_analog[8] vssa2 io_analog[9] FG_pfet
-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
+x5 gpio_analog[1] gpio_analog[0] io_analog[6] net1 vccd1 vssd1 C4
+x3 vccd1 vccd1 vssd1 vssd1 net1 gpio_noesd[0] gpio_noesd[0] 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