diff --git a/mag/sky130_sc_ams__comparator_1.mag b/mag/sky130_sc_ams__comparator_1.mag
index 2ecfe80..2f368e5 100644
--- a/mag/sky130_sc_ams__comparator_1.mag
+++ b/mag/sky130_sc_ams__comparator_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1647118226
+timestamp 1647467084
 << nwell >>
 rect -38 414 4914 582
 rect -38 261 130 414
@@ -788,10 +788,7 @@
 rect 4663 527 4721 561
 rect 4755 527 4813 561
 rect 4847 527 4876 561
-rect 94 392 162 426
 rect 654 419 874 426
-rect 94 358 128 392
-rect 94 324 162 358
 rect 292 386 874 419
 rect 1933 417 1967 433
 rect 292 385 749 386
@@ -806,18 +803,14 @@
 rect 378 111 412 145
 rect 378 17 412 77
 rect 464 315 498 385
-rect 618 331 720 351
-rect 618 297 652 331
-rect 686 297 720 331
-rect 754 331 788 347
 rect 464 247 498 281
+rect 618 348 720 351
+rect 754 331 788 347
 rect 464 179 498 213
 rect 754 263 788 297
-rect 754 195 788 229
 rect 464 111 498 145
-rect 618 161 652 195
-rect 686 161 720 195
-rect 618 127 720 161
+rect 618 127 720 134
+rect 754 195 788 229
 rect 754 111 788 161
 rect 840 331 874 386
 rect 840 263 874 297
@@ -934,6 +927,7 @@
 rect 4632 474 4666 490
 rect 4632 404 4666 424
 rect 4632 353 4666 369
+rect 4789 440 4841 459
 rect 4284 315 4300 349
 rect 4334 315 4350 349
 rect 2301 210 2335 226
@@ -994,11 +988,11 @@
 rect 4094 127 4110 161
 rect 4214 161 4248 177
 rect 4300 161 4334 314
-rect 4789 309 4841 459
+rect 4789 309 4800 440
 rect 4444 274 4460 309
 rect 4494 274 4510 309
 rect 4616 274 4632 309
-rect 4666 274 4841 309
+rect 4666 274 4800 309
 rect 4144 127 4160 160
 rect 4094 119 4160 127
 rect 4094 59 4110 119
@@ -1023,7 +1017,8 @@
 rect 4632 114 4666 149
 rect 4632 64 4666 80
 rect 4712 119 4746 135
-rect 4789 85 4841 274
+rect 4789 98 4800 274
+rect 4789 85 4841 98
 rect 4712 69 4746 85
 rect 0 -17 29 17
 rect 63 -17 121 17
@@ -1133,6 +1128,21 @@
 rect 4629 527 4663 561
 rect 4721 527 4755 561
 rect 4813 527 4847 561
+rect 94 392 187 427
+rect 94 358 128 392
+rect 128 358 162 392
+rect 162 358 187 392
+rect 94 324 187 358
+rect 618 331 720 348
+rect 618 297 652 331
+rect 652 297 686 331
+rect 686 297 720 331
+rect 618 270 720 297
+rect 618 195 720 212
+rect 618 161 652 195
+rect 652 161 686 195
+rect 686 161 720 195
+rect 618 134 720 161
 rect 840 229 874 263
 rect 1693 383 1711 417
 rect 1711 383 1727 417
@@ -1165,6 +1175,7 @@
 rect 4110 93 4144 119
 rect 4110 85 4144 93
 rect 4712 85 4746 119
+rect 4800 98 4862 440
 rect 29 -17 63 17
 rect 121 -17 155 17
 rect 213 -17 247 17
@@ -1279,6 +1290,9 @@
 rect 2376 496 4876 503
 rect 4620 459 4678 465
 rect 4620 456 4632 459
+rect 88 427 193 439
+rect 84 324 94 427
+rect 187 324 197 427
 rect 1681 417 1739 423
 rect 1681 383 1693 417
 rect 1727 414 1739 417
@@ -1293,6 +1307,11 @@
 rect 2249 388 3262 416
 rect 2249 385 2255 388
 rect 2209 373 2255 385
+rect 606 350 732 354
+rect 88 312 193 324
+rect 606 270 618 350
+rect 720 270 732 350
+rect 606 264 732 270
 rect 828 263 886 269
 rect 828 229 840 263
 rect 874 260 886 263
@@ -1318,6 +1337,9 @@
 rect 1344 229 1356 232
 rect 1390 229 1402 263
 rect 1344 223 1402 229
+rect 606 212 732 218
+rect 606 132 618 212
+rect 720 132 732 212
 rect 2510 197 2538 388
 rect 2615 328 2673 334
 rect 2615 294 2627 328
@@ -1353,6 +1375,7 @@
 rect 4392 305 4420 428
 rect 4620 424 4632 428
 rect 4666 424 4678 459
+rect 4794 440 4868 452
 rect 4620 418 4678 424
 rect 4448 391 4506 397
 rect 4448 356 4460 391
@@ -1386,6 +1409,7 @@
 rect 3265 158 3277 192
 rect 3219 152 3277 158
 rect 3099 145 3157 151
+rect 606 128 732 132
 rect 2426 119 2484 125
 rect 2426 85 2438 119
 rect 2472 116 2484 119
@@ -1414,6 +1438,9 @@
 rect 4098 79 4156 85
 rect 4700 85 4712 88
 rect 4746 85 4758 119
+rect 4790 98 4800 440
+rect 4862 98 4872 440
+rect 4794 86 4868 98
 rect 4700 79 4758 85
 rect 0 17 4873 48
 rect 0 -17 29 17
@@ -1471,6 +1498,22 @@
 rect 4755 -17 4813 17
 rect 4847 -17 4873 17
 rect 0 -48 4873 -17
+<< via1 >>
+rect 94 324 187 427
+rect 618 348 720 350
+rect 618 270 720 348
+rect 618 134 720 212
+rect 618 132 720 134
+rect 4800 98 4862 440
+<< metal2 >>
+rect 4800 440 4862 450
+rect 94 427 187 437
+rect 94 314 187 324
+rect 618 350 720 360
+rect 618 260 720 270
+rect 618 212 720 222
+rect 618 122 720 132
+rect 4800 88 4862 98
 << labels >>
 flabel metal1 29 527 63 561 0 FreeSans 192 0 0 0 VPWR
 port 7 nsew
@@ -1480,11 +1523,9 @@
 port 4 nsew
 flabel pwell 100 -17 134 17 0 FreeSans 192 0 0 0 VNB
 port 5 nsew
-flabel locali 652 161 686 195 0 FreeSans 192 0 0 0 VIN2
+flabel viali 652 161 686 195 0 FreeSans 192 0 0 0 VIN2
 port 3 nsew
-flabel locali 652 297 686 331 0 FreeSans 192 0 0 0 VIN1
-port 2 nsew
-flabel locali 128 358 162 392 0 FreeSans 192 0 0 0 CLK
+flabel viali 128 358 162 392 0 FreeSans 192 0 0 0 CLK
 port 1 nsew
 flabel locali 4798 323 4832 357 0 FreeSans 192 0 0 0 X
 port 8 nsew
@@ -1496,4 +1537,6 @@
 port 8 nsew
 flabel locali 4798 119 4832 153 0 FreeSans 192 0 0 0 X
 port 8 nsew
+flabel viali 652 297 686 331 0 FreeSans 192 0 0 0 VIN1
+port 2 nsew
 << end >>
diff --git a/mag/sky130_sc_ams__ota_1.mag b/mag/sky130_sc_ams__ota_1.mag
index 0b45396..f8c8f2e 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 1647118226
+timestamp 1647467249
 << nwell >>
 rect -38 414 6754 582
 rect -38 339 4302 414
@@ -1662,7 +1662,8 @@
 rect 6222 367 6256 383
 rect 6308 417 6342 451
 rect 6394 417 6428 451
-rect 6605 417 6699 451
+rect 6605 450 6699 451
+rect 6605 417 6656 450
 rect 6378 383 6394 417
 rect 6428 383 6487 417
 rect 6521 383 6537 417
@@ -1722,9 +1723,10 @@
 rect 6292 66 6308 100
 rect 6342 66 6358 100
 rect 6394 100 6428 134
-rect 6647 128 6699 417
-rect 6571 127 6699 128
-rect 6605 93 6699 127
+rect 6647 128 6656 417
+rect 6571 127 6656 128
+rect 6605 96 6656 127
+rect 6605 93 6699 96
 rect 5414 17 5448 66
 rect 5586 17 5620 66
 rect 5818 17 5852 66
@@ -1941,6 +1943,7 @@
 rect 5702 93 5736 100
 rect 6106 93 6140 100
 rect 6571 93 6605 127
+rect 6656 96 6716 450
 rect 29 -17 63 17
 rect 121 -17 155 17
 rect 213 -17 247 17
@@ -2137,6 +2140,7 @@
 rect 6094 411 6152 417
 rect 6559 417 6571 420
 rect 6605 417 6617 451
+rect 6650 450 6722 462
 rect 6559 411 6617 417
 rect 3602 398 3660 404
 rect 3602 364 3614 398
@@ -2332,7 +2336,10 @@
 rect 6094 87 6152 93
 rect 6559 93 6571 96
 rect 6605 93 6617 127
+rect 6646 96 6656 450
+rect 6716 96 6726 450
 rect 6559 87 6617 93
+rect 6650 84 6722 96
 rect 1912 76 1970 82
 rect 5403 48 5585 49
 rect 0 17 6716 48
@@ -2411,6 +2418,11 @@
 rect 6595 -17 6653 17
 rect 6687 -17 6716 17
 rect 0 -48 6716 -17
+<< via1 >>
+rect 6656 96 6716 450
+<< metal2 >>
+rect 6656 450 6716 460
+rect 6656 86 6716 96
 << labels >>
 flabel metal1 29 527 63 561 0 FreeSans 192 0 0 0 VPWR
 port 8 nsew
@@ -2420,13 +2432,13 @@
 port 5 nsew
 flabel pwell 100 -17 134 17 0 FreeSans 192 0 0 0 VNB
 port 6 nsew
-flabel locali 6657 366 6691 400 0 FreeSans 192 0 0 0 Iout
+flabel viali 6657 366 6691 400 0 FreeSans 192 0 0 0 Iout
 port 4 nsew
-flabel locali 6657 298 6691 332 0 FreeSans 192 0 0 0 Iout
+flabel viali 6657 298 6691 332 0 FreeSans 192 0 0 0 Iout
 port 4 nsew
-flabel locali 6657 230 6691 264 0 FreeSans 192 0 0 0 Iout
+flabel viali 6657 230 6691 264 0 FreeSans 192 0 0 0 Iout
 port 4 nsew
-flabel locali 6657 162 6691 196 0 FreeSans 192 0 0 0 Iout
+flabel viali 6657 162 6691 196 0 FreeSans 192 0 0 0 Iout
 port 4 nsew
 flabel locali 4815 55 4849 89 0 FreeSans 192 0 0 0 Vin2
 port 2 nsew
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index e8b9937..920ba4a 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,16 +1,20 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1647401204
+timestamp 1647480005
 << dnwell >>
 rect 561940 685328 563006 686342
 << pwell >>
 rect 562058 685450 562858 686250
+<< poly >>
+rect 213898 659600 213984 659910
+rect 213882 658944 213998 659266
 << locali >>
 rect 215760 659268 215804 659620
-<< viali >>
 rect 217226 659318 217280 659384
-rect 221376 659260 221422 659628
+<< viali >>
+rect 213906 659826 213974 659878
+rect 213902 658982 213982 659056
 << metal1 >>
 rect 561180 686400 561428 686442
 rect 561180 686254 561216 686400
@@ -50,21 +54,19 @@
 rect 216126 665216 216312 666238
 rect 216128 662754 216312 665216
 rect 216128 662068 216314 662754
+rect 213894 659878 213986 659884
+rect 213894 659826 213906 659878
+rect 213974 659826 213986 659878
+rect 213894 659820 213986 659826
 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 213890 659056 213994 659062
+rect 213890 658982 213902 659056
+rect 213982 658982 213994 659056
+rect 213890 658976 213994 658982
 rect 216120 642588 216298 659124
 rect 216120 641864 216126 642588
 rect 216292 641864 216298 642588
@@ -75,28 +77,11 @@
 rect 326572 684652 326878 684824
 rect 224872 683618 225178 683790
 rect 216126 681540 216304 682286
-rect 217210 659446 217298 659516
-rect 217226 659318 217280 659384
+rect 213902 658982 213982 659056
 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
@@ -106,6 +91,7 @@
 rect 415430 702606 416162 702616
 rect 467610 703066 468342 703076
 rect 122318 702546 123060 702570
+rect -193 -193 193 700125
 rect 122318 680994 123058 702546
 rect 172762 699814 173502 699834
 rect 172762 699114 172784 699814
@@ -192,34 +178,35 @@
 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 172762 681190 217496 681240
+rect 122318 680910 217316 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 213548 659820 213986 659884
 rect 4346 511652 4478 511670
-rect 213902 511652 213982 659290
-rect 215754 659264 215818 679964
+rect 213548 511652 213616 659820
+rect 340 511642 213616 511652
+rect 480 511530 213616 511642
+rect 340 511508 213616 511530
+rect 213902 659056 213982 659070
+rect 213902 468414 213982 658982
+rect 215750 657922 215838 659630
+rect 215438 657832 215838 657922
+rect 215438 583670 215526 657832
 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 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 215350 657496 216768 657578
-rect 215350 587230 215426 657496
+rect 217202 659306 217496 659394
+rect 221370 659503 221468 659648
+rect 221370 659423 223646 659503
+rect 221370 659248 221468 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
@@ -227,12 +214,25 @@
 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 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 588392 583640 588406
+rect 223530 588300 583530 588392
+rect 583634 588300 583640 588392
+rect 223530 588292 583640 588300
+rect 583530 588290 583640 588292
+rect 215768 587220 583732 587230
+rect 215768 587108 583520 587220
+rect 215768 587098 583732 587108
+rect 215438 583660 583636 583670
+rect 215438 583576 583534 583660
+rect 215438 583566 583636 583576
+rect 360 468404 213982 468414
+rect 462 468320 213982 468404
+rect 360 468310 213982 468320
 rect 524 -800 636 480
 rect 1706 -800 1818 480
 rect 2888 -800 3000 480
@@ -728,9 +728,6 @@
 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 172784 699114 173484 699814
@@ -742,21 +739,20 @@
 rect 568942 702550 569254 702900
 rect 512642 686570 513342 687270
 rect 512642 684870 513342 685570
-rect 582730 681176 583036 681526
-rect 582542 641880 583242 642580
-rect 583520 587108 583732 587220
 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 360 468320 462 468404
 << metal3 >>
 rect 165596 704800 170590 704804
 rect 175896 704800 180890 704804
-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 16194 702300 21194 704800
+rect 68194 702300 73194 704800
 rect 120194 703270 125194 704800
 rect 120194 702570 122338 703270
 rect 123038 702570 125194 703270
@@ -816,35 +812,45 @@
 rect 512620 686570 512642 687270
 rect 513342 686570 513364 687270
 rect 512620 685570 513364 686570
-rect -800 682978 1700 685242
+rect -800 680242 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 -800 643842 1660 648642
+rect 223525 646394 223657 646406
+rect 223525 646293 223537 646394
+rect 223646 646293 223657 646394
+rect -800 633842 1660 638642
+rect 223525 638402 223657 646293
 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 583484 629784 584800 634584
+rect 223525 638301 223536 638402
+rect 223645 638301 223657 638402
+rect 223525 638296 223657 638301
+rect 582342 629782 584802 634588
 rect 583520 589472 584800 589584
-rect 583520 588290 584800 588402
+rect 583520 588392 584800 588402
+rect 583520 588300 583530 588392
+rect 583634 588300 584800 588392
+rect 583520 588290 584800 588300
 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
+rect 583520 583660 584800 583674
+rect 583520 583576 583534 583660
+rect 583636 583576 584800 583660
+rect 583520 583562 584800 583576
 rect -800 559442 1660 564242
 rect -800 549442 1660 554242
 rect 582340 550562 584800 555362
@@ -864,7 +870,10 @@
 rect 583520 496504 584800 496616
 rect 583520 495322 584800 495434
 rect 583520 494140 584800 494252
-rect -800 468308 480 468420
+rect -800 468404 480 468420
+rect -800 468320 360 468404
+rect 462 468320 480 468404
+rect -800 468308 480 468320
 rect -800 467126 480 467238
 rect -800 465944 480 466056
 rect -800 464762 480 464874
@@ -1028,11 +1037,11 @@
 transform 1 0 562058 0 1 685450
 box 0 0 864 800
 use sky130_sc_ams__comparator_1  sky130_sc_ams__comparator_1_1
-timestamp 1647352739
+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 1647401204
+timestamp 1647467249
 transform 1 0 209108 0 1 659172
 box -38 -48 6754 592
 << labels >>
diff --git a/xschem/user_analog_project_wrapper.sch b/xschem/user_analog_project_wrapper.sch
index 8a3e33e..97c4382 100644
--- a/xschem/user_analog_project_wrapper.sch
+++ b/xschem/user_analog_project_wrapper.sch
@@ -11,8 +11,60 @@
 N -430 -540 -430 -510 { lab=io_analog[1]}
 N -390 -340 -350 -340 { lab=vssa1}
 N -580 -340 -550 -340 { lab=io_analog[5]}
-N -510 -280 -510 -260 {}
-N -430 -280 -430 -260 {}
+N -510 -280 -510 -260 {
+lab=io_analog[2]}
+N -430 -280 -430 -260 {
+lab=io_analog[3]}
+N 280 -460 280 -400 {
+lab=vssa1}
+N 280 -460 300 -460 {
+lab=vssa1}
+N 300 -460 300 -400 {
+lab=vssa1}
+N 290 -560 290 -460 {
+lab=vssa1}
+N 280 -280 280 -220 {
+lab=vccd1}
+N 280 -220 300 -220 {
+lab=vccd1}
+N 300 -280 300 -220 {
+lab=vccd1}
+N 290 -220 290 -160 {
+lab=vccd1}
+N 820 -460 820 -390 {
+lab=vssa1}
+N 820 -460 840 -460 {
+lab=vssa1}
+N 840 -460 840 -390 {
+lab=vssa1}
+N 830 -540 830 -460 {
+lab=vssa1}
+N 830 -560 830 -540 {
+lab=vssa1}
+N 820 -270 820 -220 {
+lab=vccd1}
+N 820 -220 840 -220 {
+lab=vccd1}
+N 840 -270 840 -220 {
+lab=vccd1}
+N 830 -220 830 -160 {
+lab=vccd1}
+N 700 -330 760 -330 {
+lab=io_in[13]}
+N 920 -330 960 -330 {
+lab=io_out[13]}
+N 960 -330 1000 -330 {
+lab=io_out[13]}
+N 700 -300 760 -300 {
+lab=io_analog[6]}
+N 700 -360 760 -360 {
+lab=io_analog[7]}
+N 370 -340 440 -340 {
+lab=gpio_analog[6]}
+N 120 -360 210 -360 {
+lab=gpio_analog[7]}
+N 120 -320 210 -320 {
+lab=gpio_analog[8]}
 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]}
@@ -53,3 +105,24 @@
 C {devices/iopin.sym} -1070 -140 0 0 {name=p37 lab=io_clamp_low[2:0]}
 C {devices/opin.sym} -1050 -70 0 0 {name=p38 lab=user_irq[2:0]}
 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} 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} 700 -330 0 0 {name=l12 sig_type=std_logic lab=io_in[13]
+}
+C {devices/lab_pin.sym} 1000 -330 2 0 {name=l13 sig_type=std_logic lab=io_out[13]
+}
+C {devices/lab_pin.sym} 700 -360 0 0 {name=l14 sig_type=std_logic lab=io_analog[7]
+}
+C {devices/lab_pin.sym} 700 -300 0 0 {name=l15 sig_type=std_logic lab=io_analog[6]
+}
+C {devices/lab_pin.sym} 440 -340 2 0 {name=l16 sig_type=std_logic lab=gpio_analog[6]}
+C {devices/lab_pin.sym} 120 -360 0 0 {name=l17 sig_type=std_logic lab=gpio_analog[7]
+}
+C {devices/lab_pin.sym} 120 -320 0 0 {name=l18 sig_type=std_logic lab=gpio_analog[8]
+}