diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index ec9a22e..78c4aa1 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 1647626244
+timestamp 1653683538
 << nwell >>
 rect 208506 659508 209222 659758
 rect 212242 659754 212610 659980
@@ -176,11 +176,6 @@
 rect 225178 683618 560962 683790
 rect 224866 683613 560962 683618
 rect 224866 683612 226828 683613
-rect 216120 682286 216308 682294
-rect 216120 681540 216126 682286
-rect 216304 681540 216308 682286
-rect 216120 680764 216308 681540
-rect 216120 680580 216310 680764
 rect 51438 666500 51708 666507
 rect 51438 666332 51446 666500
 rect 51700 666332 51708 666500
@@ -190,19 +185,16 @@
 rect 43033 663425 50280 663434
 rect 50094 661154 50280 663425
 rect 51438 661176 51708 666332
-rect 216126 666238 216310 680580
-rect 216126 665216 216312 666238
 rect 53452 663594 56384 663602
 rect 53452 663434 56256 663594
 rect 56376 663434 56384 663594
 rect 53452 663426 56384 663434
 rect 51830 661200 52004 661224
 rect 53452 661220 53628 663426
-rect 216128 662754 216312 665216
-rect 216128 662068 216314 662754
 rect 51830 661166 51858 661200
 rect 51976 661166 52004 661200
 rect 51830 660998 52004 661166
+rect 216128 661102 227510 661294
 rect 51839 657600 52002 660998
 rect 212270 659920 212576 659944
 rect 212270 659828 212344 659920
@@ -213,7 +205,7 @@
 rect 213974 659826 213986 659878
 rect 213894 659820 213986 659826
 rect 208504 659764 208944 659766
-rect 216128 659764 216312 662068
+rect 216128 659764 216312 661102
 rect 218744 659932 219050 659956
 rect 218744 659840 218818 659932
 rect 218996 659840 219050 659932
@@ -249,31 +241,36 @@
 rect 213982 658982 213994 659056
 rect 213890 658976 213994 658982
 rect 212290 658864 212696 658960
-rect 51839 657502 51858 657600
-rect 51982 657502 52002 657600
-rect 51839 657487 52002 657502
-rect 216120 642588 216298 659124
+rect 216120 658348 216298 659124
 rect 218946 659012 219312 659050
 rect 218946 658958 219014 659012
 rect 219222 658958 219312 659012
 rect 218946 658932 219312 658958
 rect 218920 658836 219326 658932
-rect 216120 641864 216126 642588
-rect 216292 641864 216298 642588
-rect 216120 641856 216298 641864
+rect 216120 658338 226138 658348
+rect 216120 658154 225910 658338
+rect 226126 658154 226138 658338
+rect 216120 658144 226138 658154
+rect 51839 657502 51858 657600
+rect 51982 657502 52002 657600
+rect 51839 657487 52002 657502
+rect 227322 581322 227510 661102
+rect 227322 581188 227336 581322
+rect 227494 581188 227510 581322
+rect 227322 581174 227510 581188
 << via1 >>
 rect 561216 686254 561378 686400
 rect 561216 685764 561378 685910
 rect 326572 684652 326878 684824
 rect 224872 683618 225178 683790
-rect 216126 681540 216304 682286
 rect 51446 666332 51700 666500
 rect 43042 663434 43190 663602
 rect 56256 663434 56376 663594
 rect 213908 659826 213974 659878
 rect 213902 658982 213982 659056
+rect 225910 658154 226126 658338
 rect 51858 657502 51982 657600
-rect 216126 641864 216292 642588
+rect 227336 581188 227494 581322
 << metal2 >>
 rect 512622 703358 513362 703376
 rect 122320 703284 123060 703286
@@ -364,14 +361,8 @@
 rect 225178 683618 225189 683790
 rect 224862 683607 225189 683618
 rect 512610 682292 513366 684870
-rect 216120 682286 513366 682292
-rect 216120 681540 216126 682286
-rect 216304 681546 513366 682286
-rect 216304 681540 513364 681546
-rect 216120 681536 513364 681540
-rect 562127 681532 562489 685199
-rect 582202 681532 583046 681536
-rect 562127 681526 583046 681532
+rect 225894 681546 513366 682292
+rect 225894 681536 513364 681546
 rect 172762 681190 217496 681240
 rect 122318 680910 217316 680994
 rect 122318 680908 123058 680910
@@ -408,30 +399,25 @@
 rect 216680 657578 216768 659598
 rect 217190 659438 217316 680910
 rect 217412 659394 217496 681190
-rect 562127 681176 582730 681526
-rect 583036 681176 583046 681526
-rect 562127 681170 583046 681176
-rect 582202 681166 583046 681170
 rect 217202 659306 217496 659394
 rect 221370 659503 221468 659648
 rect 221370 659423 223646 659503
 rect 221370 659248 221468 659423
+rect 223537 658412 223646 659423
 rect 215768 657496 216768 657578
 rect 215770 587230 215846 657496
-rect 223537 646394 223646 659423
-rect 223537 646283 223646 646293
-rect 216120 642588 583256 642596
-rect 216120 641864 216126 642588
-rect 216292 642580 583256 642588
-rect 216292 641880 582542 642580
-rect 583242 641880 583256 642580
-rect 216292 641864 583256 641880
-rect 216120 641856 583256 641864
-rect 223536 638408 223645 638412
-rect 223530 638402 223650 638408
-rect 223530 638301 223536 638402
-rect 223645 638301 223650 638402
-rect 223530 588406 223650 638301
+rect 223530 588406 223650 658412
+rect 225898 658338 226138 681536
+rect 562127 681532 562489 685199
+rect 582202 681532 583046 681536
+rect 562127 681526 583046 681532
+rect 562127 681176 582730 681526
+rect 583036 681176 583046 681526
+rect 562127 681170 583046 681176
+rect 582202 681166 583046 681170
+rect 225898 658154 225910 658338
+rect 226126 658154 226138 658338
+rect 225898 658144 226138 658154
 rect 223530 588392 583640 588406
 rect 223530 588300 583530 588392
 rect 583634 588300 583640 588392
@@ -443,6 +429,15 @@
 rect 215438 583660 583636 583670
 rect 215438 583576 583534 583660
 rect 215438 583566 583636 583576
+rect 227322 581322 227510 581334
+rect 227322 581188 227336 581322
+rect 227494 581188 227510 581322
+rect 227322 553478 227510 581188
+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 360 468404 213982 468414
 rect 462 468320 213982 468404
 rect 360 468310 213982 468320
@@ -960,12 +955,10 @@
 rect 51858 657502 51982 657600
 rect 340 511530 480 511642
 rect 582730 681176 583036 681526
-rect 223537 646293 223646 646394
-rect 582542 641880 583242 642580
-rect 223536 638301 223645 638402
 rect 583530 588300 583634 588392
 rect 583520 587108 583732 587220
 rect 583534 583576 583636 583660
+rect 582550 552760 583250 553460
 rect 360 468320 462 468404
 << metal3 >>
 rect 16194 702300 21194 704800
@@ -1061,17 +1054,7 @@
 rect -800 633842 1660 638642
 rect -800 564240 1660 564242
 rect 49246 564240 54048 657502
-rect 223525 646394 223657 646406
-rect 223525 646293 223537 646394
-rect 223646 646293 223657 646394
-rect 223525 638402 223657 646293
-rect 582332 642580 584800 644584
-rect 582332 641880 582542 642580
-rect 583242 641880 584800 642580
-rect 582332 639784 584800 641880
-rect 223525 638301 223536 638402
-rect 223645 638301 223657 638402
-rect 223525 638296 223657 638301
+rect 582340 639784 584800 644584
 rect 582340 629784 584800 634584
 rect 583520 589472 584800 589584
 rect 583520 588392 584800 588402
@@ -1092,7 +1075,11 @@
 rect -800 559442 1660 559445
 rect 49246 559441 54048 559445
 rect -800 549442 1660 554242
-rect 582340 550562 584800 555362
+rect 582339 553554 584800 555362
+rect 582340 553460 584800 553554
+rect 582340 552760 582550 553460
+rect 583250 552760 584800 553460
+rect 582340 550562 584800 552760
 rect 582340 540562 584800 545362
 rect 330 511642 490 511647
 rect -800 511530 340 511642
@@ -1267,22 +1254,22 @@
 rect -100 0 0 704000
 rect 584000 0 584100 704000
 rect -100 -100 584100 0
-use FG_pfet  FG_pfet_0
-timestamp 1647625697
-transform 1 0 52313 0 1 660624
-box -2563 -40 1390 600
-use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_1
-timestamp 1647538073
-transform 1 0 209108 0 1 659172
-box -38 -48 6754 592
-use sky130_sc_ams__comparator_1  sky130_sc_ams__comparator_1_1
-timestamp 1647467084
-transform 1 0 216584 0 1 659172
-box -38 -48 4914 592
 use 1T1R_2x2  1T1R_2x2_0
 timestamp 1647533459
 transform 1 0 562058 0 1 685450
 box 0 0 864 800
+use FG_pfet  FG_pfet_0
+timestamp 1653683538
+transform 1 0 52313 0 1 660624
+box -2563 -40 1390 600
+use sky130_sc_ams__comparator_1  sky130_sc_ams__comparator_1_1
+timestamp 1647467084
+transform 1 0 216584 0 1 659172
+box -38 -48 4914 592
+use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_1
+timestamp 1647538073
+transform 1 0 209108 0 1 659172
+box -38 -48 6754 592
 << 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/xschem/user_analog_project_wrapper.sch b/xschem/user_analog_project_wrapper.sch
index cb3dda8..d9e7fc3 100644
--- a/xschem/user_analog_project_wrapper.sch
+++ b/xschem/user_analog_project_wrapper.sch
@@ -16,31 +16,31 @@
 N -430 -280 -430 -260 {
 lab=io_analog[3]}
 N 280 -460 280 -400 {
-lab=vssa1}
+lab=vdda1}
 N 280 -460 300 -460 {
-lab=vssa1}
+lab=vdda1}
 N 300 -460 300 -400 {
-lab=vssa1}
+lab=vdda1}
 N 290 -560 290 -460 {
-lab=vssa1}
+lab=vdda1}
 N 280 -280 280 -220 {
-lab=vccd1}
+lab=vssa1}
 N 280 -220 300 -220 {
-lab=vccd1}
+lab=vssa1}
 N 300 -280 300 -220 {
-lab=vccd1}
+lab=vssa1}
 N 290 -220 290 -160 {
-lab=vccd1}
+lab=vssa1}
 N 820 -460 820 -390 {
-lab=vssa1}
+lab=vdda1}
 N 820 -460 840 -460 {
-lab=vssa1}
+lab=vdda1}
 N 840 -460 840 -390 {
-lab=vssa1}
+lab=vdda1}
 N 830 -540 830 -460 {
-lab=vssa1}
+lab=vdda1}
 N 830 -560 830 -540 {
-lab=vssa1}
+lab=vdda1}
 N 820 -270 820 -220 {
 lab=vccd1}
 N 820 -220 840 -220 {
@@ -68,7 +68,7 @@
 N -430 -1030 -380 -1030 { lab=vssa2}
 N -430 -940 -380 -940 { lab=io_analog[9]}
 N -610 -990 -560 -990 { lab=io_analog[8]}
-N -480 -1080 -480 -1040 { lab=io_analog[9]}
+N -480 -1080 -480 -1040 { lab=io_analog[10]}
 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]}
@@ -111,11 +111,11 @@
 C {devices/ipin.sym} -1030 -460 0 0 {name=p39 lab=la_oenb[127:0]}
 C {sky130_sc_ams__ota_1.sym} 290 -340 0 0 {name=x2}
 C {sky130_sc_ams__comparator_1.sym} 830 -330 0 0 {name=x3}
-C {devices/lab_pin.sym} 290 -560 0 0 {name=l7 sig_type=std_logic lab=vssa1}
-C {devices/lab_pin.sym} 290 -160 0 0 {name=l8 sig_type=std_logic lab=vccd1
+C {devices/lab_pin.sym} 290 -560 0 0 {name=l7 sig_type=std_logic lab=vdda1}
+C {devices/lab_pin.sym} 290 -160 0 0 {name=l8 sig_type=std_logic lab=vssa1
 }
-C {devices/lab_pin.sym} 830 -160 0 0 {name=l10 sig_type=std_logic lab=vccd1}
-C {devices/lab_pin.sym} 830 -560 0 0 {name=l11 sig_type=std_logic lab=vssa1
+C {devices/lab_pin.sym} 830 -160 0 0 {name=l10 sig_type=std_logic lab=vssa1}
+C {devices/lab_pin.sym} 830 -560 0 0 {name=l11 sig_type=std_logic lab=vdda1
 }
 C {devices/lab_pin.sym} 700 -330 0 0 {name=l12 sig_type=std_logic lab=io_in[13]
 }