diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index a5b3f80..a5af6ad 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/mag/C4.mag b/mag/C4.mag
index ca7793d..8146a02 100644
--- a/mag/C4.mag
+++ b/mag/C4.mag
@@ -1,15 +1,16 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1654638763
+timestamp 1654654453
 << nwell >>
-rect 8 166 210 596
+rect 38 421 240 596
+rect 18 166 220 421
 << nmos >>
 rect -144 400 -60 430
 rect -133 -27 -49 3
 rect 66 -27 150 3
 << pmos >>
-rect 65 285 151 315
+rect 75 285 161 315
 << ndiff >>
 rect -144 501 -60 513
 rect -144 442 -133 501
@@ -36,14 +37,14 @@
 rect 139 -98 150 -39
 rect 66 -110 150 -98
 << pdiff >>
-rect 65 388 151 400
-rect 65 329 77 388
-rect 138 329 151 388
-rect 65 315 151 329
-rect 65 273 151 285
-rect 65 214 77 273
-rect 138 214 151 273
-rect 65 202 151 214
+rect 75 388 161 400
+rect 75 329 87 388
+rect 148 329 161 388
+rect 75 315 161 329
+rect 75 273 161 285
+rect 75 214 87 273
+rect 148 214 161 273
+rect 75 202 161 214
 << ndiffc >>
 rect -133 442 -72 501
 rect -132 329 -71 388
@@ -52,8 +53,8 @@
 rect -121 -98 -60 -39
 rect 78 -98 139 -39
 << pdiffc >>
-rect 77 329 138 388
-rect 77 214 138 273
+rect 87 329 148 388
+rect 87 214 148 273
 << psubdiff >>
 rect -145 228 -118 262
 rect -84 228 -60 262
@@ -62,16 +63,16 @@
 rect 66 -199 93 -165
 rect 127 -199 151 -165
 << nsubdiff >>
-rect 55 524 161 560
-rect 55 490 91 524
-rect 125 490 161 524
-rect 55 454 161 490
+rect 85 524 191 560
+rect 85 490 121 524
+rect 155 490 191 524
+rect 85 454 191 490
 << psubdiffcont >>
 rect -118 228 -84 262
 rect -107 -199 -73 -165
 rect 93 -199 127 -165
 << nsubdiffcont >>
-rect 91 490 125 524
+rect 121 490 155 524
 << poly >>
 rect -324 432 -258 448
 rect -324 398 -308 432
@@ -80,13 +81,13 @@
 rect -60 400 -34 430
 rect -274 398 -258 400
 rect -324 382 -258 398
-rect 184 318 250 334
-rect 184 315 200 318
-rect 39 285 65 315
-rect 151 285 200 315
-rect 184 284 200 285
-rect 234 284 250 318
-rect 184 268 250 284
+rect 194 318 260 334
+rect 194 315 210 318
+rect 49 285 75 315
+rect 161 285 210 315
+rect 194 284 210 285
+rect 244 284 260 318
+rect 194 268 260 284
 rect -124 161 -60 177
 rect -124 127 -108 161
 rect -74 153 -60 161
@@ -105,29 +106,31 @@
 rect -263 -45 -197 -29
 << polycont >>
 rect -308 398 -274 432
-rect 200 284 234 318
+rect 210 284 244 318
 rect -108 127 -74 161
 rect -247 -29 -213 5
 << locali >>
-rect 77 524 138 540
+rect 107 539 168 540
+rect 103 524 171 539
 rect -135 501 -71 513
-rect 77 501 91 524
+rect 103 501 121 524
 rect -324 433 -258 448
 rect -172 442 -133 501
-rect -72 490 91 501
-rect 125 490 138 524
-rect -72 442 138 490
+rect -72 490 121 501
+rect 155 490 171 524
+rect -72 474 171 490
+rect -72 442 148 474
 rect -324 397 -309 433
 rect -273 397 -258 433
 rect -324 382 -258 397
-rect 77 388 138 442
+rect 87 388 148 442
 rect -209 329 -132 388
 rect -71 329 -33 388
-rect 61 329 77 388
-rect 138 329 154 388
+rect 71 329 87 388
+rect 148 329 164 388
 rect -323 234 -253 247
 rect -209 234 -168 329
-rect 200 318 234 334
+rect 210 318 244 334
 rect -323 231 -168 234
 rect -323 197 -307 231
 rect -271 197 -168 231
@@ -135,9 +138,9 @@
 rect -134 228 -119 262
 rect -84 228 -67 262
 rect -134 211 -67 228
-rect 61 214 77 273
-rect 138 214 154 273
-rect 200 268 234 284
+rect 71 214 87 273
+rect 148 214 164 273
+rect 210 268 244 284
 rect -323 193 -168 197
 rect -323 180 -253 193
 rect -209 177 -168 193
@@ -146,13 +149,13 @@
 rect -74 127 -60 161
 rect -209 111 -60 127
 rect -124 74 -60 111
-rect 77 148 138 214
+rect 87 148 148 214
 rect 211 148 277 152
-rect 77 137 277 148
-rect 77 101 226 137
+rect 87 137 277 148
+rect 87 101 226 137
 rect 262 101 277 137
-rect 77 89 277 101
-rect 77 74 177 89
+rect 87 89 277 101
+rect 87 74 177 89
 rect 211 86 277 89
 rect -263 6 -197 21
 rect -161 15 -122 74
@@ -175,7 +178,7 @@
 rect 127 -199 144 -165
 rect 77 -216 144 -199
 << viali >>
-rect 91 490 125 524
+rect 121 490 155 524
 rect -309 432 -273 433
 rect -309 398 -308 432
 rect -308 398 -274 432
@@ -193,16 +196,15 @@
 rect -107 -199 -73 -165
 rect 93 -199 127 -165
 << metal1 >>
-rect -202 662 143 672
+rect -202 662 215 672
 rect -202 594 -192 662
-rect -124 594 143 662
-rect -202 584 143 594
-rect 23 578 143 584
-rect 23 527 185 578
-rect 77 524 138 527
-rect 77 490 91 524
-rect 125 490 138 524
-rect 77 478 138 490
+rect -124 594 215 662
+rect -202 584 215 594
+rect 53 527 215 584
+rect 107 524 168 527
+rect 107 490 121 524
+rect 155 490 168 524
+rect 107 478 168 490
 rect -324 433 51 448
 rect -324 397 -309 433
 rect -273 397 51 433
@@ -305,7 +307,8 @@
 rect -1571 185 -318 242
 rect -258 185 -228 242
 rect -1571 152 -228 185
-rect 211 160 311 170
+rect 221 166 311 170
+rect 211 160 311 166
 rect -1571 -251 -368 152
 rect 211 80 221 160
 rect 301 80 311 160
@@ -367,7 +370,8 @@
 rect -416 577 -205 578
 rect -416 -210 -415 577
 rect 441 170 442 630
-rect 211 160 442 170
+rect 221 166 442 170
+rect 211 160 442 166
 rect 211 80 221 160
 rect 301 80 442 160
 rect 211 70 442 80
@@ -388,10 +392,10 @@
 port 8 n
 flabel space -178 -254 226 -157 5 FreeSans 400 0 0 0 vss
 port 7 s
-flabel poly 184 268 250 334 7 FreeSans 400 0 0 0 vth
-port 6 w
 flabel poly -263 -45 -197 21 7 FreeSans 400 0 0 0 vtl
 port 5 w
 flabel metal2 -1956 584 -1878 659 7 FreeSans 400 0 0 0 vin
 port 9 w
+flabel poly 194 268 260 334 7 FreeSans 400 0 0 0 vth
+port 6 w
 << end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 6c6827b..8c22bd9 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,11 +1,12 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1654617947
+timestamp 1654654453
 << pwell >>
-rect 250064 656547 250679 656913
+rect 250868 656547 251483 656913
 << viali >>
-rect 249697 656568 249731 656603
+rect 243709 657061 243743 657095
+rect 250501 656568 250535 656603
 << metal1 >>
 rect 141506 696318 582623 696394
 rect 141697 696214 582502 696290
@@ -65,15 +66,15 @@
 rect 263241 658463 263251 658791
 rect 263414 658463 263424 658791
 rect 51839 657487 52002 657502
-rect 244667 657539 245015 657542
-rect 244667 657524 247729 657539
+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 247729 657418
-rect 243532 657329 245015 657404
-rect 244666 657196 245015 657329
-rect 244667 657194 245015 657196
+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
@@ -86,19 +87,19 @@
 rect 243243 656735 243249 656795
 rect 243309 656735 243315 656795
 rect 243243 656729 243315 656735
-rect 244665 656697 244925 656748
-rect 244665 656624 244986 656697
-rect 243327 656520 244986 656624
-rect 249677 656611 249751 656623
-rect 249677 656557 249686 656611
-rect 249740 656557 249751 656611
-rect 249677 656548 249751 656557
-rect 244665 656453 244986 656520
+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 244665 656443 574386 656453
 rect 244665 656337 572978 656443
 rect 574376 656337 574386 656443
 rect 244665 656327 574386 656337
-rect 244665 656325 244869 656327
+rect 244665 656325 245729 656327
 rect 581952 551915 582055 656985
 rect 581942 551868 582056 551915
 rect 581942 551782 582055 551868
@@ -138,15 +139,19 @@
 rect 56256 663434 56376 663594
 rect 51858 657502 51982 657600
 rect 263251 658463 263414 658791
-rect 249679 657328 249732 657380
-rect 243693 657048 243753 657108
+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 249686 656603 249740 656611
-rect 249686 656568 249697 656603
-rect 249697 656568 249731 656603
-rect 249731 656568 249740 656603
-rect 249686 656557 249740 656568
+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 582193 536318 582257 536382
@@ -180,7 +185,7 @@
 rect 51838 657502 51856 657602
 rect 51982 657502 52004 657602
 rect 51838 657486 52004 657502
-rect 173176 656906 173258 699219
+rect 173176 657436 173258 699219
 rect 224634 698474 225366 698484
 rect 224634 697884 224644 698474
 rect 225356 697884 225366 698474
@@ -264,25 +269,23 @@
 rect 583036 681176 583046 681526
 rect 562127 681170 583046 681176
 rect 582202 681166 583046 681170
-rect 249655 657380 249755 657402
-rect 249655 657328 249679 657380
-rect 249732 657328 249755 657380
-rect 242068 657108 243763 657184
+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 241325 656906 241557 656932
-rect 173176 656824 241557 656906
-rect 241325 656796 241557 656824
 rect 242068 656700 242148 657104
-rect 243683 657048 243693 657104
-rect 243753 657048 243763 657108
-rect 249655 657073 249755 657328
-rect 243683 657038 243763 657048
-rect 244682 656973 249755 657073
-rect 251568 657089 251632 657157
-rect 251568 657078 252703 657089
-rect 251568 656995 252532 657078
+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 251568 656984 252703 656995
+rect 252372 656984 252703 656995
 rect 213548 656632 242148 656700
 rect 4346 511652 4478 511670
 rect 213548 511652 213616 656632
@@ -291,11 +294,11 @@
 rect 243228 656735 243249 656795
 rect 243309 656735 243318 656795
 rect 243228 656466 243318 656735
-rect 251568 656623 251632 656984
-rect 249677 656611 251632 656623
-rect 249677 656557 249686 656611
-rect 249740 656557 251632 656611
-rect 249677 656547 251632 656557
+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
@@ -428,42 +431,41 @@
 rect 582183 269256 583547 269320
 rect 583611 269256 583620 269320
 rect 582183 269248 583620 269256
-rect 524 350 560 480
-rect 524 -800 636 350
-rect 1706 -800 1818 350
-rect 2888 -800 3000 350
-rect 4070 -800 4182 350
-rect 5252 -800 5364 350
-rect 6434 -800 6546 350
-rect 7616 -800 7728 350
-rect 8798 -800 8910 350
-rect 9980 -800 10092 350
-rect 11162 -800 11274 350
-rect 12344 -800 12456 350
-rect 13526 -800 13638 350
-rect 14708 -800 14820 350
-rect 15890 -800 16002 350
-rect 17072 -800 17184 350
-rect 18254 -800 18366 350
-rect 19436 -800 19548 350
-rect 20618 -800 20730 350
-rect 21800 -800 21912 350
-rect 22982 -800 23094 350
-rect 24164 -800 24276 350
-rect 25346 -800 25458 350
-rect 26528 -800 26640 350
-rect 27710 -800 27822 350
-rect 28892 -800 29004 350
-rect 30074 -800 30186 350
-rect 31256 -800 31368 350
-rect 32438 -800 32550 350
-rect 33620 -800 33732 350
-rect 34802 -800 34914 350
-rect 35984 -800 36096 350
-rect 37166 -800 37278 350
-rect 38348 -800 38460 350
-rect 39530 -800 39642 350
-rect 40712 -800 40824 350
+rect 524 -800 636 480
+rect 1706 -800 1818 480
+rect 2888 -800 3000 480
+rect 4070 -800 4182 480
+rect 5252 -800 5364 480
+rect 6434 -800 6546 480
+rect 7616 -800 7728 480
+rect 8798 -800 8910 480
+rect 9980 -800 10092 480
+rect 11162 -800 11274 480
+rect 12344 -800 12456 480
+rect 13526 -800 13638 480
+rect 14708 -800 14820 480
+rect 15890 -800 16002 480
+rect 17072 -800 17184 480
+rect 18254 -800 18366 480
+rect 19436 -800 19548 480
+rect 20618 -800 20730 480
+rect 21800 -800 21912 480
+rect 22982 -800 23094 480
+rect 24164 -800 24276 480
+rect 25346 -800 25458 480
+rect 26528 -800 26640 480
+rect 27710 -800 27822 480
+rect 28892 -800 29004 480
+rect 30074 -800 30186 480
+rect 31256 -800 31368 480
+rect 32438 -800 32550 480
+rect 33620 -800 33732 480
+rect 34802 -800 34914 480
+rect 35984 -800 36096 480
+rect 37166 -800 37278 480
+rect 38348 -800 38460 480
+rect 39530 -800 39642 480
+rect 40712 -800 40824 480
 rect 41894 -800 42006 480
 rect 43076 -800 43188 480
 rect 44258 -800 44370 480
@@ -1125,7 +1127,7 @@
 rect -800 246488 480 246600
 rect -800 214888 1660 219688
 rect -800 204888 1660 209688
-rect 572969 194416 574386 653284
+rect 572969 198757 574386 653284
 rect 582340 642128 584800 644584
 rect 582340 641800 582847 642128
 rect 583161 641800 584800 642128
@@ -1198,11 +1200,12 @@
 rect 583520 269230 584800 269256
 rect 582340 235230 584800 240030
 rect 582340 225230 584800 230030
-rect 582340 194416 584800 196230
-rect 572969 193003 584800 194416
-rect 572969 193001 574386 193003
-rect 582340 191430 584800 193003
-rect 582340 181430 584800 186230
+rect 572969 193001 574395 198757
+rect 572970 184324 574395 193001
+rect 582340 191430 584800 196230
+rect 582340 184324 584800 186230
+rect 572970 182899 584800 184324
+rect 582340 181430 584800 182899
 rect -800 172888 1660 177688
 rect -800 162888 1660 167688
 rect 582340 146830 584800 151630
@@ -1291,9 +1294,9 @@
 transform 1 0 562058 0 1 685450
 box 0 0 864 800
 use C4  C4_0
-timestamp 1654617947
+timestamp 1654654453
 transform 1 0 243509 0 1 656777
-box -2031 -257 1273 678
+box -3132 -258 1273 678
 use FG_pfet  FG_pfet_0
 timestamp 1654453464
 transform 1 0 52313 0 1 660624
@@ -1304,7 +1307,7 @@
 box -5090 -470 22390 1062
 use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_0
 timestamp 1654556429
-transform 1 0 245281 0 1 656700
+transform 1 0 246083 0 1 656700
 box -398 -153 6394 687
 << labels >>
 flabel metal3 s 582300 677984 584800 682984 0 FreeSans 1120 0 0 0 io_analog[0]