diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index bcd04e5..e8b9937 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,15 +1,16 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1647124351
+timestamp 1647401204
 << dnwell >>
 rect 561940 685328 563006 686342
 << pwell >>
 rect 562058 685450 562858 686250
 << locali >>
-rect 548026 677495 548438 677529
-rect 543778 677268 543874 677316
-rect 548026 676951 548440 676985
+rect 215760 659268 215804 659620
+<< viali >>
+rect 217226 659318 217280 659384
+rect 221376 659260 221422 659628
 << metal1 >>
 rect 561180 686400 561428 686442
 rect 561180 686254 561216 686400
@@ -40,36 +41,76 @@
 rect 225178 683618 560962 683790
 rect 224866 683613 560962 683618
 rect 224866 683612 226828 683613
-rect 548032 677464 548438 677560
-rect 543766 677426 543886 677436
-rect 543766 677372 543776 677426
-rect 543876 677372 543886 677426
-rect 543766 677262 543886 677372
-rect 543162 677002 543810 677016
-rect 543162 676932 543168 677002
-rect 543794 676932 543810 677002
-rect 543162 676920 543810 676932
-rect 548029 676920 548440 677016
+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 216126 666238 216310 680580
+rect 216126 665216 216312 666238
+rect 216128 662754 216312 665216
+rect 216128 662068 216314 662754
+rect 216128 659764 216312 662068
+rect 215822 659762 216662 659764
+rect 215798 659668 216662 659762
+rect 221370 659628 221428 659640
+rect 215754 659264 215806 659622
+rect 217200 659446 217210 659516
+rect 217298 659446 217308 659516
+rect 217220 659384 217286 659396
+rect 217216 659318 217226 659384
+rect 217280 659318 217290 659384
+rect 217220 659306 217286 659318
+rect 221370 659260 221376 659628
+rect 221422 659260 221428 659628
+rect 221370 659248 221428 659260
+rect 215808 659124 216648 659220
+rect 216120 642588 216298 659124
+rect 216120 641864 216126 642588
+rect 216292 641864 216298 642588
+rect 216120 641856 216298 641864
 << via1 >>
 rect 561216 686254 561378 686400
 rect 561216 685764 561378 685910
 rect 326572 684652 326878 684824
 rect 224872 683618 225178 683790
-rect 554512 677472 555148 677550
-rect 543776 677372 543876 677426
-rect 543168 676932 543794 677002
+rect 216126 681540 216304 682286
+rect 217210 659446 217298 659516
+rect 217226 659318 217280 659384
+rect 216126 641864 216292 642588
 << metal2 >>
+rect 18270 703344 19010 703362
+rect 18270 702644 18290 703344
+rect 18990 702644 19010 703344
 rect 512622 703358 513362 703376
+rect -193 -193 193 700125
+rect 682 682996 17422 682998
+rect 680 682978 17422 682996
+rect 680 682278 694 682978
+rect 1394 682278 17422 682978
+rect 680 682258 17422 682278
+rect 680 682256 1420 682258
+rect 16666 679360 17420 682258
+rect 18270 680024 19010 702644
+rect 70336 703276 71076 703294
+rect 122320 703284 123060 703286
+rect 70336 702576 70356 703276
+rect 71056 702576 71076 703276
+rect 70336 680888 71076 702576
+rect 122318 703270 123060 703284
+rect 122318 702570 122338 703270
+rect 123038 702570 123060 703270
 rect 415430 703206 416162 703216
 rect 415430 702616 415440 703206
 rect 416152 702616 416162 703206
 rect 415430 702606 416162 702616
 rect 467610 703066 468342 703076
-rect -193 -193 193 700125
-rect 172840 699800 173580 699824
-rect 172840 699100 172858 699800
-rect 173558 699100 173580 699800
-rect 172840 699084 173580 699100
+rect 122318 702546 123060 702570
+rect 122318 680994 123058 702546
+rect 172762 699814 173502 699834
+rect 172762 699114 172784 699814
+rect 173484 699114 173502 699814
+rect 172762 681240 173502 699114
 rect 224634 698474 225366 698484
 rect 224634 697884 224644 698474
 rect 225356 697884 225366 698474
@@ -104,15 +145,13 @@
 rect 568933 700536 569264 702550
 rect 522681 700196 562334 700528
 rect 564007 700208 569264 700536
-rect 512622 687282 513364 687290
-rect 512622 686566 512642 687282
-rect 513342 686566 513364 687282
+rect 512622 687270 513364 687290
+rect 512622 686570 512642 687270
+rect 513342 686570 513364 687270
 rect 562009 686923 562327 700196
 rect 564010 687532 564332 700208
 rect 568933 700207 569264 700208
-rect 512622 686565 512766 686566
-rect 513264 686565 513364 686566
-rect 512622 686558 513364 686565
+rect 512622 686558 513364 686570
 rect 512624 686550 513364 686558
 rect 467832 686484 560486 686486
 rect 467832 686400 561462 686484
@@ -134,49 +173,66 @@
 rect 415661 685764 561216 685910
 rect 561378 685764 561462 685910
 rect 415661 685672 561462 685764
-rect 562270 685199 562343 685519
 rect 326562 684652 326572 684824
 rect 326878 684652 326889 684824
 rect 326562 684641 326889 684652
+rect 512610 685570 513366 685590
+rect 512610 684870 512642 685570
+rect 513342 684870 513366 685570
+rect 562270 685199 562343 685519
 rect 224862 683618 224872 683790
 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 172762 681190 221428 681240
+rect 122318 680910 217496 680994
+rect 122318 680908 123058 680910
+rect 70342 680580 71076 680888
+rect 70342 680484 217316 680580
+rect 18270 679964 215818 680024
+rect 16666 679292 213974 679360
+rect 213906 659594 213974 679292
+rect 4346 511652 4478 511670
+rect 213902 511652 213982 659290
+rect 215754 659264 215818 679964
+rect 216680 657578 216768 659598
+rect 217190 659516 217316 680484
+rect 217190 659446 217210 659516
+rect 217298 659446 217316 659516
+rect 217190 659426 217316 659446
+rect 217412 659394 217496 680910
+rect 217224 659384 217496 659394
+rect 217224 659318 217226 659384
+rect 217280 659318 217496 659384
+rect 217224 659306 217496 659318
+rect 221370 659248 221428 681190
 rect 562127 681176 582730 681526
 rect 583036 681176 583046 681526
 rect 562127 681170 583046 681176
 rect 582202 681166 583046 681170
-rect 543766 677426 543886 677696
-rect 555482 677560 559312 677618
-rect 554504 677550 559312 677560
-rect 554504 677472 554512 677550
-rect 555148 677472 559312 677550
-rect 554504 677464 559312 677472
-rect 543766 677372 543776 677426
-rect 543876 677372 543886 677426
-rect 543766 677364 543886 677372
-rect 555482 677362 559312 677464
-rect 512642 677336 542642 677338
-rect 512624 677308 542642 677336
-rect 512624 676608 512642 677308
-rect 513342 677140 542642 677308
-rect 513342 677016 542784 677140
-rect 513342 677002 543810 677016
-rect 513342 676932 543168 677002
-rect 543794 676932 543810 677002
-rect 513342 676920 543810 676932
-rect 513342 676796 542784 676920
-rect 513342 676608 542642 676796
-rect 512624 676598 542642 676608
-rect 512624 676582 513360 676598
-rect 558568 642500 559308 677362
-rect 558568 642478 583348 642500
-rect 558568 641778 582624 642478
-rect 583324 641778 583348 642478
-rect 558568 641760 583348 641778
-rect 558568 641758 559308 641760
+rect 215350 657496 216768 657578
+rect 215350 587230 215426 657496
+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 215350 587220 583732 587230
+rect 215350 587108 583520 587220
+rect 215350 587098 583732 587108
+rect 340 511642 213988 511652
+rect 480 511530 213988 511642
+rect 340 511508 213988 511530
 rect 524 -800 636 480
 rect 1706 -800 1818 480
 rect 2888 -800 3000 480
@@ -672,25 +728,39 @@
 rect 582068 -800 582180 480
 rect 583250 -800 583362 480
 << via2 >>
+rect 18290 702644 18990 703344
+rect 694 682278 1394 682978
+rect 70356 702576 71056 703276
+rect 122338 702570 123038 703270
 rect 415440 702616 416152 703206
-rect 172858 699100 173558 699800
+rect 172784 699114 173484 699814
 rect 224644 697884 225356 698474
 rect 326344 697884 327056 698474
 rect 467620 702476 468332 703066
 rect 512642 702658 513342 703358
 rect 522694 702578 523000 702928
 rect 568942 702550 569254 702900
-rect 512642 686566 513342 687282
-rect 512766 686565 513264 686566
+rect 512642 686570 513342 687270
+rect 512642 684870 513342 685570
 rect 582730 681176 583036 681526
-rect 512642 676608 513342 677308
-rect 582624 641778 583324 642478
+rect 582542 641880 583242 642580
+rect 583520 587108 583732 587220
+rect 340 511530 480 511642
 << metal3 >>
 rect 165596 704800 170590 704804
 rect 175896 704800 180890 704804
-rect 16194 702300 21194 704800
-rect 68194 702300 73194 704800
-rect 120194 702300 125194 704800
+rect 16194 703344 21194 704800
+rect 16194 702644 18290 703344
+rect 18990 702644 21194 703344
+rect 16194 702300 21194 702644
+rect 68194 703276 73194 704800
+rect 68194 702576 70356 703276
+rect 71056 702576 73194 703276
+rect 68194 702300 73194 702576
+rect 120194 703270 125194 704800
+rect 120194 702570 122338 703270
+rect 123038 702570 125194 703270
+rect 120194 702300 125194 702570
 rect 165594 702300 170594 704800
 rect 170894 702300 173094 704800
 rect 173394 702300 175594 704800
@@ -725,10 +795,10 @@
 rect 566594 702300 571594 702550
 rect 165596 701002 170590 702300
 rect 175896 701002 180890 702300
-rect 165556 699800 180890 701002
-rect 165556 699100 172858 699800
-rect 173558 699100 180890 699800
-rect 165556 698298 180890 699100
+rect 165556 699814 180890 701002
+rect 165556 699114 172784 699814
+rect 173484 699114 180890 699814
+rect 165556 698298 180890 699114
 rect 217296 699170 222286 702300
 rect 227598 699170 232588 702300
 rect 217296 698474 232588 699170
@@ -742,33 +812,36 @@
 rect 318994 697884 326344 698474
 rect 327056 697884 334288 698474
 rect 318994 697340 334288 697884
-rect 512612 687282 513364 687312
-rect 512612 686566 512642 687282
-rect 513342 686566 513364 687282
-rect 512612 686565 512766 686566
-rect 513264 686565 513364 686566
-rect 512612 686542 513364 686565
-rect -800 680242 1700 685242
-rect 512622 677308 513362 686542
+rect 512620 687270 513364 687278
+rect 512620 686570 512642 687270
+rect 513342 686570 513364 687270
+rect 512620 685570 513364 686570
+rect -800 682978 1700 685242
+rect 512620 684870 512642 685570
+rect 513342 684870 513364 685570
+rect 512620 684846 513364 684870
+rect -800 682278 694 682978
+rect 1394 682278 1700 682978
+rect -800 680242 1700 682278
 rect 582300 681526 584802 682984
 rect 582300 681176 582730 681526
 rect 583036 681176 584802 681526
 rect 582300 677984 584802 681176
-rect 512622 676758 512642 677308
-rect 512624 676608 512642 676758
-rect 513342 676758 513362 677308
-rect 513342 676608 513360 676758
-rect 512624 676582 513360 676608
 rect -800 643842 1660 648642
-rect 582340 642478 584800 644584
-rect 582340 641778 582624 642478
-rect 583324 641778 584800 642478
-rect 582340 639784 584800 641778
+rect 583484 644570 584800 644584
+rect 582332 642580 584800 644570
+rect 582332 641880 582542 642580
+rect 583242 641880 584800 642580
+rect 582332 639784 584800 641880
+rect 582332 639778 584798 639784
 rect -800 633842 1660 638642
-rect 582340 629784 584800 634584
+rect 583484 629784 584800 634584
 rect 583520 589472 584800 589584
 rect 583520 588290 584800 588402
-rect 583520 587108 584800 587220
+rect 583510 587220 583742 587225
+rect 583510 587108 583520 587220
+rect 583732 587108 584800 587220
+rect 583510 587103 583742 587108
 rect 583520 585926 584800 586038
 rect 583520 584744 584800 584856
 rect 583520 583562 584800 583674
@@ -776,7 +849,10 @@
 rect -800 549442 1660 554242
 rect 582340 550562 584800 555362
 rect 582340 540562 584800 545362
-rect -800 511530 480 511642
+rect 330 511642 490 511647
+rect -800 511530 340 511642
+rect 480 511530 490 511642
+rect 330 511525 490 511530
 rect -800 510348 480 510460
 rect -800 509166 480 509278
 rect -800 507984 480 508096
@@ -951,13 +1027,13 @@
 timestamp 1645671873
 transform 1 0 562058 0 1 685450
 box 0 0 864 800
-use sky130_sc_ams__comparator_1  sky130_sc_ams__comparator_1_0
-timestamp 1647118226
-transform 1 0 543156 0 1 676968
+use sky130_sc_ams__comparator_1  sky130_sc_ams__comparator_1_1
+timestamp 1647352739
+transform 1 0 216584 0 1 659172
 box -38 -48 4914 592
-use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_0
-timestamp 1647118226
-transform 1 0 548438 0 1 676968
+use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_1
+timestamp 1647401204
+transform 1 0 209108 0 1 659172
 box -38 -48 6754 592
 << labels >>
 flabel metal3 s 583520 269230 584800 269342 0 FreeSans 1120 0 0 0 gpio_analog[0]