diff --git a/mag/BGR_lvs.mag b/mag/BGR_lvs.mag
index 9d28899..e4455d7 100644
--- a/mag/BGR_lvs.mag
+++ b/mag/BGR_lvs.mag
@@ -1,7 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1663029885
+timestamp 1664651080
+<< error_s >>
+rect -2243 -2874 -2230 -2626
+rect -1995 -3088 -1982 -2874
+rect -4470 -3810 7062 -3806
+rect -4470 -5140 7062 -5048
 << nwell >>
 rect -8726 10225 -8100 11452
 << locali >>
@@ -760,11 +765,11 @@
 transform 0 1 -13057 -1 0 -5305
 box -1417 -1173 5029 21223
 use XM_bjt  XM_bjt_0
-timestamp 1662737136
+timestamp 1664651080
 transform 1 0 -1950 0 1 -2620
 box 0 0 6492 9068
 use XM_bjt_out  XM_bjt_out_0
-timestamp 1662907566
+timestamp 1664651080
 transform 1 0 -2070 0 1 6780
 box 0 0 6492 3916
 use XM_current_gate_with_dummy  XM_current_gate_with_dummy_0
diff --git a/mag/XM_bjt.mag b/mag/XM_bjt.mag
index b7ea1f7..8c4ef48 100644
--- a/mag/XM_bjt.mag
+++ b/mag/XM_bjt.mag
@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1662737136
+timestamp 1664651080
 << locali >>
 rect 20 4410 3200 4440
 rect 20 3960 3200 3990
@@ -54,9 +54,9 @@
 << metal2 >>
 rect 1550 2350 1700 2355
 rect 1550 2195 1700 2200
-use sky130_fd_pr__rf_pnp_05v5_W3p40L3p40  sky130_fd_pr__rf_pnp_05v5_W3p40L3p40_0 $PDKPATH/libs.ref/sky130_fd_pr/mag
+use sky130_fd_pr__rf_pnp_05v5_W3p40L3p40  sky130_fd_pr__rf_pnp_05v5_W3p40L3p40_0 pdk/sky130A/libs.ref/sky130_fd_pr/mag
 array 0 4 644 0 6 644
-timestamp 1657128861
+timestamp 1650294714
 transform 1 0 0 0 1 0
 box 0 0 670 670
 << end >>
diff --git a/mag/XM_bjt_out.mag b/mag/XM_bjt_out.mag
index d13f65e..f2b215b 100644
--- a/mag/XM_bjt_out.mag
+++ b/mag/XM_bjt_out.mag
@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1662907566
+timestamp 1664651080
 << locali >>
 rect 300 1600 3000 1650
 rect 300 950 1410 1000
@@ -14,9 +14,9 @@
 << metal2 >>
 rect 1550 1050 1700 1055
 rect 1550 895 1700 900
-use sky130_fd_pr__rf_pnp_05v5_W3p40L3p40  sky130_fd_pr__rf_pnp_05v5_W3p40L3p40_0 $PDKPATH/libs.ref/sky130_fd_pr/mag
+use sky130_fd_pr__rf_pnp_05v5_W3p40L3p40  sky130_fd_pr__rf_pnp_05v5_W3p40L3p40_0 pdk/sky130A/libs.ref/sky130_fd_pr/mag
 array 0 4 644 0 2 644
-timestamp 1657128861
+timestamp 1650294714
 transform 1 0 0 0 1 0
 box 0 0 670 670
 << end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 9211223..c5e34f7 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1664297014
+timestamp 1664654199
+<< error_s >>
+rect 251987 565529 252000 565777
+rect 252235 565315 252248 565529
+rect 240166 564593 261830 564597
+rect 240166 563203 262230 563355
+rect 240166 561961 262230 562113
+rect 240166 560719 262230 560871
+rect 240166 559477 262230 559629
 << metal1 >>
 rect 14920 682870 15420 682910
 rect 14920 682040 14960 682870
@@ -10,6 +18,7 @@
 rect 14920 668180 23410 668280
 rect 14920 668100 23840 668180
 rect 14920 668060 23410 668100
+rect 14920 433640 15420 668060
 rect 55960 662600 56100 662620
 rect 55960 662500 55980 662600
 rect 56080 662500 56100 662600
@@ -30,6 +39,47 @@
 rect 56980 660100 57000 660200
 rect 57100 660100 57120 660200
 rect 56980 660080 57120 660100
+rect 14920 433480 144980 433640
+rect 144900 432740 144980 433480
+rect 55960 400380 58040 400400
+rect 55960 400300 55980 400380
+rect 56080 400300 57920 400380
+rect 58020 400300 58040 400380
+rect 55960 400280 58040 400300
+rect 139220 400380 139340 400400
+rect 139220 400300 139240 400380
+rect 139220 400280 139340 400300
+rect 56200 400120 58040 400140
+rect 56200 400040 56220 400120
+rect 56320 400040 57920 400120
+rect 58020 400040 58040 400120
+rect 56200 400020 58040 400040
+rect 138320 400120 138460 400140
+rect 138320 400040 138340 400120
+rect 138440 400040 138460 400120
+rect 138320 400020 138460 400040
+rect 56480 399860 58040 399880
+rect 56480 399780 56500 399860
+rect 56600 399780 57920 399860
+rect 58020 399780 58040 399860
+rect 56480 399760 58040 399780
+rect 137720 399860 137860 399880
+rect 137720 399780 137740 399860
+rect 137840 399780 137860 399860
+rect 137720 399760 137860 399780
+rect 56720 399600 58040 399620
+rect 56720 399520 56740 399600
+rect 56840 399520 57920 399600
+rect 58020 399520 58040 399600
+rect 56720 399500 58040 399520
+rect 137180 399600 137320 399620
+rect 137180 399520 137200 399600
+rect 137300 399520 137320 399600
+rect 137180 399500 137320 399520
+rect 136820 399340 136960 399360
+rect 136820 399260 136840 399340
+rect 136940 399260 136960 399340
+rect 136820 399240 136960 399260
 << via1 >>
 rect 14960 682040 15390 682870
 rect 55980 662500 56080 662600
@@ -37,6 +87,19 @@
 rect 56500 660980 56600 661080
 rect 56740 660460 56840 660560
 rect 57000 660100 57100 660200
+rect 55980 400300 56080 400380
+rect 57920 400300 58020 400380
+rect 139240 400300 139340 400380
+rect 56220 400040 56320 400120
+rect 57920 400040 58020 400120
+rect 138340 400040 138440 400120
+rect 56500 399780 56600 399860
+rect 57920 399780 58020 399860
+rect 137740 399780 137840 399860
+rect 56740 399520 56840 399600
+rect 57920 399520 58020 399600
+rect 137200 399520 137300 399600
+rect 136840 399260 136940 399340
 << metal2 >>
 rect 14920 682870 15420 682910
 rect 14920 682040 14960 682870
@@ -46,46 +109,83 @@
 rect 23190 671440 23210 671610
 rect 23370 671440 25400 671610
 rect 23190 671420 25400 671440
-rect 55960 662600 56100 662620
+rect 55960 662600 56100 662700
 rect 55960 662500 55980 662600
 rect 56080 662500 56100 662600
-rect 55960 335220 56100 662500
+rect 55960 400380 56100 662500
+rect 55960 400300 55980 400380
+rect 56080 400300 56100 400380
+rect 55960 292200 56100 400300
 rect 56200 661680 56340 661700
 rect 56200 661580 56220 661680
 rect 56320 661580 56340 661680
-rect 56200 378460 56340 661580
+rect 56200 400120 56340 661580
+rect 56200 400040 56220 400120
+rect 56320 400040 56340 400120
+rect 56200 335220 56340 400040
 rect 56480 661080 56620 661100
 rect 56480 660980 56500 661080
 rect 56600 660980 56620 661080
-rect 56480 421660 56620 660980
+rect 56480 399860 56620 660980
+rect 56480 399780 56500 399860
+rect 56600 399780 56620 399860
+rect 56480 378460 56620 399780
 rect 56720 660560 56860 660580
 rect 56720 660460 56740 660560
 rect 56840 660460 56860 660560
-rect 56720 466080 56860 660460
+rect 56720 421660 56860 660460
+rect 56720 421520 56740 421660
+rect 56840 421520 56860 421660
+rect 56720 399600 56860 421520
+rect 56720 399520 56740 399600
+rect 56840 399520 56860 399600
+rect 56720 399500 56860 399520
 rect 56980 660200 57120 660220
 rect 56980 660100 57000 660200
 rect 57100 660100 57120 660200
-rect 56980 508120 57120 660100
+rect 56980 466080 57120 660100
 rect 238000 591000 246800 592200
 rect 238000 582000 239000 591000
 rect 246000 582000 246800 591000
 rect 238000 580200 246800 582000
 rect 246300 579400 246700 580200
-rect 56980 507980 57000 508120
-rect 57100 507980 57120 508120
-rect 56980 507960 57120 507980
-rect 56720 465940 56740 466080
-rect 56840 465940 56860 466080
-rect 56720 465920 56860 465940
-rect 56480 421520 56500 421660
-rect 56600 421520 56620 421660
-rect 56480 421500 56620 421520
-rect 56200 378320 56220 378460
-rect 56320 378320 56340 378460
-rect 56200 378300 56340 378320
-rect 55960 335080 55980 335220
-rect 56080 335080 56100 335220
-rect 55960 335060 56100 335080
+rect 56980 465940 57000 466080
+rect 57100 465940 57120 466080
+rect 56980 399360 57120 465940
+rect 148200 430920 148420 435520
+rect 57900 400380 139360 400400
+rect 57900 400300 57920 400380
+rect 58020 400300 139240 400380
+rect 139340 400300 139360 400380
+rect 57900 400280 139360 400300
+rect 57900 400120 138460 400140
+rect 57900 400040 57920 400120
+rect 58020 400040 138340 400120
+rect 138440 400040 138460 400120
+rect 57900 400020 138460 400040
+rect 57900 399860 137860 399880
+rect 57900 399780 57920 399860
+rect 58020 399780 137740 399860
+rect 137840 399780 137860 399860
+rect 57900 399760 137860 399780
+rect 57900 399600 137320 399620
+rect 57900 399520 57920 399600
+rect 58020 399520 137200 399600
+rect 137300 399520 137320 399600
+rect 57900 399500 137320 399520
+rect 56980 399340 136960 399360
+rect 56980 399260 136840 399340
+rect 136940 399260 136960 399340
+rect 56980 399240 136960 399260
+rect 56480 378320 56500 378460
+rect 56600 378320 56620 378460
+rect 56480 378300 56620 378320
+rect 56200 335080 56220 335220
+rect 56320 335080 56340 335220
+rect 56200 335060 56340 335080
+rect 55960 291860 55980 292000
+rect 56080 291860 56100 292000
+rect 55960 291840 56100 291860
 rect 524 -800 636 480
 rect 1706 -800 1818 480
 rect 2888 -800 3000 480
@@ -583,12 +683,12 @@
 << via2 >>
 rect 14960 682040 15390 682870
 rect 23210 671440 23370 671610
+rect 56740 421520 56840 421660
 rect 239000 582000 246000 591000
-rect 57000 507980 57100 508120
-rect 56740 465940 56840 466080
-rect 56500 421520 56600 421660
-rect 56220 378320 56320 378460
-rect 55980 335080 56080 335220
+rect 57000 465940 57100 466080
+rect 56500 378320 56600 378460
+rect 56220 335080 56320 335220
+rect 55980 291860 56080 292000
 << metal3 >>
 rect 16194 702300 21194 704800
 rect 68194 702300 73194 704800
@@ -644,13 +744,14 @@
 rect 23190 668640 23390 668680
 rect 310 648642 1780 648730
 rect -800 648600 1780 648642
-rect -800 647000 80246 648600
-rect -800 643842 73000 647000
-rect 246 638642 73000 643842
-rect -800 635000 73000 638642
-rect 79000 635000 80246 647000
-rect -800 633842 80246 635000
-rect 246 633838 80246 633842
+rect -800 648200 5000 648600
+rect -800 643842 2200 648200
+rect 246 638642 2200 643842
+rect -800 634200 2200 638642
+rect 4600 634200 5000 648200
+rect -800 633842 5000 634200
+rect 246 633838 5000 633842
+rect 1800 633800 5000 633838
 rect 120000 606000 124000 701000
 rect 510000 694000 511000 702000
 rect 525000 694000 526000 702000
@@ -664,8 +765,10 @@
 rect 580000 631000 584800 634584
 rect 570200 629800 584800 631000
 rect 582340 629784 584800 629800
-rect 21990 604000 22000 606000
-rect 24000 604000 24010 606000
+rect 21990 605800 24010 606000
+rect 21990 605000 22400 605800
+rect 23600 605000 24010 605800
+rect 21990 604000 24010 605000
 rect 22000 596000 24000 604000
 rect 120000 602000 288000 606000
 rect 22000 594000 285400 596000
@@ -675,9 +778,8 @@
 rect 182000 583000 239000 590000
 rect 164000 582000 239000 583000
 rect 246000 582000 246010 591000
-rect 154000 581400 158000 582000
 rect 238990 581995 246010 582000
-rect 154000 580000 245900 581400
+rect 85400 580000 245900 581400
 rect 283800 580600 285400 594000
 rect 286000 580600 287600 602000
 rect 583520 589472 584800 589584
@@ -697,79 +799,78 @@
 rect 4000 550000 4430 555000
 rect -800 549442 4430 550000
 rect 680 549410 4430 549442
-rect -800 511530 480 511642
-rect -800 510348 480 510460
-rect -800 509166 480 509278
-rect 260 508120 57120 508140
-rect 260 508096 57000 508120
-rect -800 507984 57000 508096
-rect 260 507980 57000 507984
-rect 57100 507980 57120 508120
-rect 260 507960 57120 507980
-rect -800 506802 480 506914
-rect -800 505620 480 505732
-rect -800 468308 480 468420
-rect -800 467126 480 467238
-rect 280 466080 56860 466100
-rect 280 466056 56740 466080
-rect -800 465944 56740 466056
-rect 280 465940 56740 465944
-rect 56840 465940 56860 466080
-rect 280 465920 56860 465940
-rect -800 464762 480 464874
-rect -800 463580 480 463692
-rect -800 462398 480 462510
-rect -800 425086 480 425198
-rect -800 423904 480 424016
-rect -800 422722 480 422834
-rect 360 421660 56620 421680
-rect 360 421652 56500 421660
-rect -800 421540 56500 421652
-rect 360 421520 56500 421540
-rect 56600 421520 56620 421660
-rect 360 421500 56620 421520
-rect -800 420358 480 420470
-rect -800 419176 480 419288
-rect -800 381864 480 381976
-rect -800 380682 480 380794
-rect -800 379500 480 379612
-rect 400 378460 56340 378480
-rect 400 378430 56220 378460
-rect -800 378320 56220 378430
-rect 56320 378320 56340 378460
-rect -800 378318 56340 378320
-rect 400 378300 56340 378318
-rect -800 377136 480 377248
-rect -800 375954 480 376066
-rect -800 338642 480 338754
-rect -800 337460 480 337572
-rect -800 336278 480 336390
-rect 260 335220 56100 335240
-rect 260 335208 55980 335220
-rect -800 335096 55980 335208
-rect 260 335080 55980 335096
-rect 56080 335080 56100 335220
-rect 260 335060 56100 335080
-rect -800 333914 480 334026
-rect -800 332732 480 332844
-rect 200 295532 800 295600
-rect -800 295420 800 295532
-rect 200 295400 800 295420
-rect 154000 295400 158000 580000
+rect 85400 511800 86800 580000
 rect 582340 550562 584800 555362
 rect 582340 540562 584800 545362
+rect 400 511642 86800 511800
+rect -800 511530 86800 511642
+rect 400 511200 86800 511530
+rect -800 510348 480 510460
+rect -800 509166 480 509278
+rect -800 507984 260 508096
+rect -800 506802 480 506914
+rect -800 505620 480 505732
 rect 583520 500050 584800 500162
 rect 583520 498868 584800 498980
 rect 583520 497686 584800 497798
 rect 583520 496504 584800 496616
 rect 583520 495322 584800 495434
 rect 583520 494140 584800 494252
+rect -800 468308 480 468420
+rect 163400 467800 200000 468000
+rect -800 467126 480 467238
+rect 163400 466200 198200 467800
+rect 199800 466200 200000 467800
+rect 280 466080 57120 466100
+rect 280 466056 57000 466080
+rect -800 465944 57000 466056
+rect 280 465940 57000 465944
+rect 57100 465940 57120 466080
+rect 280 465920 57120 465940
+rect 163400 466000 200000 466200
+rect -800 464762 480 464874
+rect -800 463580 480 463692
+rect -800 462398 480 462510
+rect -800 425086 480 425198
+rect -800 423904 480 424016
+rect -800 422722 480 422834
+rect 360 421660 56860 421680
+rect 360 421652 56740 421660
+rect -800 421540 56740 421652
+rect 360 421520 56740 421540
+rect 56840 421520 56860 421660
+rect 360 421500 56860 421520
+rect -800 420358 480 420470
+rect -800 419176 480 419288
+rect 163400 415700 164900 466000
 rect 583520 455628 584800 455740
 rect 583520 454446 584800 454558
 rect 583520 453264 584800 453376
 rect 583520 452082 584800 452194
 rect 583520 450900 584800 451012
 rect 583520 449718 584800 449830
+rect 152900 415200 154200 415700
+rect 155900 415200 164900 415700
+rect 152900 414870 153400 415200
+rect 152900 414440 152960 414870
+rect 153360 414440 153400 414870
+rect 152900 414400 153400 414440
+rect 158890 414870 164900 414900
+rect 158890 414440 158950 414870
+rect 159350 414440 164900 414870
+rect 158890 414400 164900 414440
+rect -800 381864 480 381976
+rect -800 380682 480 380794
+rect -800 379500 480 379612
+rect 400 378460 56620 378480
+rect 400 378430 56500 378460
+rect -800 378320 56500 378430
+rect 56600 378320 56620 378460
+rect -800 378318 56620 378320
+rect 400 378300 56620 378318
+rect -800 377136 480 377248
+rect -800 375954 480 376066
+rect 163400 362000 164900 414400
 rect 583520 411206 584800 411318
 rect 583520 410024 584800 410136
 rect 583520 408842 584800 408954
@@ -779,22 +880,43 @@
 rect 583520 364784 584800 364896
 rect 583520 363602 584800 363714
 rect 583520 362420 584800 362532
+rect 163400 361800 200000 362000
+rect 163400 360200 198200 361800
+rect 199800 360200 200000 361800
 rect 583520 361238 584800 361350
+rect 163400 360000 200000 360200
 rect 583520 360056 584800 360168
 rect 583520 358874 584800 358986
+rect -800 338642 480 338754
+rect -800 337460 480 337572
+rect -800 336278 480 336390
+rect 260 335220 56340 335240
+rect 260 335208 56220 335220
+rect -800 335096 56220 335208
+rect 260 335080 56220 335096
+rect 56320 335080 56340 335220
+rect 260 335060 56340 335080
+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 313652 584800 313764
-rect 200 294600 158000 295400
+rect 200 295532 800 295600
+rect -800 295420 800 295532
+rect 200 295400 800 295420
 rect 200 294350 800 294400
 rect -800 294238 800 294350
 rect 200 294200 800 294238
-rect 154000 294000 158000 294600
 rect -800 293056 480 293168
-rect -800 291874 480 291986
+rect 400 292000 56100 292020
+rect 400 291986 55980 292000
+rect -800 291874 55980 291986
+rect 400 291860 55980 291874
+rect 56080 291860 56100 292000
+rect 400 291840 56100 291860
 rect -800 290692 480 290804
 rect -800 289510 480 289622
 rect 583520 275140 584800 275252
@@ -895,13 +1017,17 @@
 rect 42560 688410 43180 689440
 rect 40770 676130 41640 677240
 rect 23210 668680 23370 669080
-rect 73000 635000 79000 647000
+rect 2200 634200 4600 648200
 rect 511000 694000 525000 702000
 rect 572000 631000 580000 643000
-rect 22000 604000 24000 606000
+rect 22400 605000 23600 605800
 rect 165000 583000 182000 590000
 rect 860 559570 4260 564080
 rect 1000 550000 4000 555000
+rect 198200 466200 199800 467800
+rect 152960 414440 153360 414870
+rect 158950 414440 159350 414870
+rect 198200 360200 199800 361800
 rect 11340 210740 17140 219500
 << metal4 >>
 rect 165594 703000 170594 704800
@@ -916,40 +1042,43 @@
 rect 40720 676090 43450 676130
 rect 40720 676080 43220 676090
 rect 60220 676010 65450 676030
-rect 56870 675970 65450 676010
-rect 56870 675440 60910 675970
-rect 65380 675440 65450 675970
-rect 56870 675370 65450 675440
+rect 56870 675370 65450 676010
 rect 23190 669080 23390 669110
 rect 23190 668680 23210 669080
 rect 23370 668680 23390 669080
-rect 23190 608120 23390 668680
-rect 26600 633690 28120 662640
-rect 72999 647000 79001 647001
-rect 72999 635000 73000 647000
-rect 79000 635000 79001 647000
-rect 72999 634999 79001 635000
-rect 26090 633500 28790 633690
-rect 26090 631620 26270 633500
-rect 28580 631620 28790 633500
-rect 26090 631490 28790 631620
-rect 32100 620300 39650 620900
-rect 32100 614050 32850 620300
-rect 38700 614050 39650 620300
-rect 32100 613600 39650 614050
-rect 21660 606000 25780 608120
-rect 21660 604000 22000 606000
-rect 24000 604000 25780 606000
-rect 21660 603350 25780 604000
+rect 1800 648200 5000 648600
+rect 1800 634200 2200 648200
+rect 4600 634200 5000 648200
+rect 1800 633800 5000 634200
+rect 23190 619600 23390 668680
+rect 25400 662640 27800 663400
+rect 25400 633690 28120 662640
+rect 32000 658600 39600 659000
+rect 32000 656800 32200 658600
+rect 39200 656800 39600 658600
+rect 25400 631490 28200 633690
+rect 22600 611800 23400 619600
+rect 22200 605800 23800 611800
+rect 22200 605000 22400 605800
+rect 23600 605000 23800 605800
+rect 22200 604800 23800 605000
 rect 690 564080 4450 564270
 rect 690 559570 860 564080
 rect 4260 559570 4450 564080
 rect 690 559400 4450 559570
+rect 25400 564000 28000 631490
+rect 32000 620900 39600 656800
+rect 32000 618600 39650 620900
+rect 32100 613600 39650 618600
 rect 999 555000 4001 555001
 rect 999 550000 1000 555000
 rect 4000 550000 4001 555000
+rect 25400 550600 25800 564000
+rect 27600 550600 28000 564000
+rect 25400 550200 28000 550600
 rect 999 549999 4001 550000
-rect 30150 219860 39650 613600
+rect 30150 418600 39650 613600
+rect 60600 564000 65400 675370
 rect 165000 590001 182000 703000
 rect 217294 702300 222294 704800
 rect 227594 702300 232594 704800
@@ -972,6 +1101,12 @@
 rect 238200 570900 240100 574000
 rect 258800 571400 260000 580000
 rect 238200 568100 239300 570900
+rect 60600 550400 61000 564000
+rect 65000 550400 65400 564000
+rect 60600 550000 65400 550400
+rect 126400 563600 131200 564000
+rect 126400 550400 126800 563600
+rect 130800 550400 131200 563600
 rect 238200 563700 240200 568100
 rect 239700 558000 240200 563700
 rect 510000 563000 526000 660000
@@ -983,24 +1118,48 @@
 rect 510000 555000 511000 563000
 rect 525000 555000 526000 563000
 rect 510000 554000 526000 555000
+rect 30150 409800 30600 418600
+rect 39000 409800 39650 418600
+rect 30150 219860 39650 409800
+rect 126400 429800 131200 550400
+rect 198000 467800 200000 468000
+rect 198000 466200 198200 467800
+rect 199800 466200 200000 467800
+rect 198000 466000 200000 466200
+rect 126400 428200 139400 429800
+rect 126400 399000 131200 428200
+rect 152900 414870 159400 414900
+rect 152900 414440 152960 414870
+rect 153360 414440 158950 414870
+rect 159350 414440 159400 414870
+rect 152900 414400 159400 414440
+rect 126400 397800 152800 399000
+rect 198000 361800 200000 362000
+rect 198000 360200 198200 361800
+rect 199800 360200 200000 361800
+rect 198000 360000 200000 360200
 rect 10880 219500 39650 219860
 rect 10880 210740 11340 219500
 rect 17140 214040 39650 219500
 rect 17140 210740 39640 214040
 rect 10880 210360 39640 210740
 << via4 >>
-rect 60910 675440 65380 675970
-rect 73000 635000 79000 647000
-rect 26270 631620 28580 633500
-rect 32850 614050 38700 620300
+rect 2200 635400 4600 646600
+rect 32200 656800 39200 658600
 rect 860 559570 4260 564080
 rect 1000 550000 4000 555000
+rect 25800 550600 27600 564000
 rect 238000 636000 248000 644000
 rect 307000 637000 315000 645000
+rect 61000 550400 65000 564000
+rect 126800 550400 130800 563600
 rect 238200 558000 239700 563700
 rect 572000 631000 580000 643000
 rect 263600 556400 316600 557900
 rect 511000 555000 525000 563000
+rect 30600 409800 39000 418600
+rect 198200 466200 199800 467800
+rect 198200 360200 199800 361800
 << metal5 >>
 rect 165594 702300 170594 704800
 rect 175894 702300 180894 704800
@@ -1008,71 +1167,99 @@
 rect 227594 702300 232594 704800
 rect 318994 702300 323994 704800
 rect 329294 702300 334294 704800
-rect 60790 675970 65590 676060
-rect 60790 675440 60910 675970
-rect 65380 675440 65590 675970
-rect 26080 633500 28810 633710
-rect 26080 631620 26270 633500
-rect 28580 631620 28810 633500
-rect 26080 564330 28810 631620
-rect 33890 625850 34330 675040
-rect 39240 625850 39680 674940
-rect 42370 625850 42840 674830
-rect 44740 625850 45180 675000
-rect 45790 625850 46240 663160
-rect 60790 652300 65590 675440
-rect 32150 620300 51000 625850
-rect 32150 614050 32850 620300
-rect 38700 614050 51000 620300
-rect 32150 613550 51000 614050
-rect 60820 564330 65590 652300
+rect 32000 659200 33600 675200
+rect 35600 659200 36200 675200
+rect 38800 659200 39400 675200
+rect 42200 659200 43800 675200
+rect 45800 659200 46400 660800
+rect 32000 658600 46400 659200
+rect 32000 656800 32200 658600
+rect 39200 656800 46400 658600
+rect 32000 656400 46400 656800
 rect 72976 647000 79024 647024
-rect 72976 635000 73000 647000
-rect 79000 645000 553600 647000
-rect 79000 644000 307000 645000
-rect 79000 636000 238000 644000
+rect 1800 646600 553600 647000
+rect 1800 635400 2200 646600
+rect 4600 645000 553600 646600
+rect 4600 644000 307000 645000
+rect 4600 636000 238000 644000
 rect 248000 637000 307000 644000
 rect 315000 637000 553600 645000
 rect 248000 636000 553600 637000
-rect 79000 635000 553600 636000
+rect 4600 635400 553600 636000
+rect 1800 635000 553600 635400
 rect 560200 643000 582000 647000
 rect 72976 634976 79024 635000
 rect 560200 631000 572000 643000
 rect 580000 631000 582000 643000
 rect 560200 630000 582000 631000
-rect 26080 564320 65590 564330
-rect 1770 564270 65590 564320
-rect 690 564080 65590 564270
+rect 60760 564330 65600 564340
+rect 28810 564320 65600 564330
+rect 1770 564270 65600 564320
+rect 690 564080 65600 564270
 rect 690 559570 860 564080
-rect 4260 564000 65590 564080
-rect 4260 563700 526000 564000
-rect 4260 559570 238200 563700
-rect 690 559400 238200 559570
-rect 1000 558000 238200 559400
+rect 4260 564000 65600 564080
+rect 4260 559570 25800 564000
+rect 690 559400 25800 559570
+rect 1000 555024 25800 559400
+rect 976 555000 25800 555024
+rect 976 550000 1000 555000
+rect 4000 550600 25800 555000
+rect 27600 550600 61000 564000
+rect 4000 550400 61000 550600
+rect 65000 563700 526000 564000
+rect 65000 563600 238200 563700
+rect 65000 550400 126800 563600
+rect 130800 558000 238200 563600
 rect 239700 563000 526000 563700
 rect 239700 558000 511000 563000
-rect 1000 557900 511000 558000
-rect 1000 556400 263600 557900
+rect 130800 557900 511000 558000
+rect 130800 556400 263600 557900
 rect 316600 556400 511000 557900
-rect 1000 555024 511000 556400
-rect 976 555000 511000 555024
+rect 130800 555000 511000 556400
 rect 525000 555000 526000 563000
-rect 976 550000 1000 555000
-rect 4000 550000 526000 555000
+rect 130800 550400 526000 555000
+rect 4000 550000 526000 550400
 rect 976 549976 4024 550000
+rect 198000 467800 200000 468000
+rect 198000 466200 198200 467800
+rect 199800 466200 200000 467800
+rect 198000 466000 200000 466200
+rect 122000 424200 152000 425400
+rect 122000 419000 123600 424200
+rect 30200 418600 123600 419000
+rect 30200 409800 30600 418600
+rect 39000 417800 123600 418600
+rect 39000 416600 152000 417800
+rect 39000 413600 123600 416600
+rect 39000 412400 152000 413600
+rect 39000 410600 123600 412400
+rect 39000 409800 137600 410600
+rect 30200 409400 137600 409800
+rect 198000 361800 200000 362000
+rect 198000 360200 198200 361800
+rect 199800 360200 200000 361800
+rect 198000 360000 200000 360200
 << comment >>
 rect -100 704000 584100 704100
 rect -100 0 0 704000
 rect 584000 0 584100 704000
 rect -100 -100 584100 0
 use BGR_lvs  BGR_lvs_0
-timestamp 1663029885
+timestamp 1664651080
 transform 1 0 254230 0 1 568403
 box -14230 -10403 62405 12600
+use TX_line  TX_line_0
+timestamp 1662988821
+transform 1 0 200000 0 1 464000
+box -24000 -128000 220000 24000
 use VCO  VCO_0
 timestamp 1663030914
 transform 1 0 -7837 0 1 638742
 box 31141 20430 65400 41673
+use VCO  VCO_1
+timestamp 1663030914
+transform 0 1 115536 -1 0 464188
+box 31141 20430 65400 41673
 << labels >>
 flabel metal3 s 583520 269230 584800 269342 0 FreeSans 1120 0 0 0 gpio_analog[0]
 port 0 nsew signal bidirectional
@@ -2453,16 +2640,19 @@
 port 676 nsew signal input
 flabel metal2 s 6434 -800 6546 480 0 FreeSans 1120 90 0 0 wbs_we_i
 port 677 nsew signal input
-flabel metal5 26080 559400 65590 564330 0 FreeSans 16000 0 0 0 GND
-rlabel metal2 56980 508120 57120 660100 1 CTRL1
+flabel space 26080 559400 65590 564330 0 FreeSans 16000 0 0 0 GND
 rlabel metal2 56720 466080 56860 660460 1 CTRL2
 rlabel metal2 56480 421660 56620 660980 1 CTRL3
 rlabel metal2 56200 378460 56340 661580 1 CTRL4
-rlabel metal2 55960 335220 56100 662500 1 CTRL5
 flabel metal1 14920 668060 15420 682040 0 FreeSans 8000 0 0 0 VCTRL
-flabel metal4 21660 603350 25780 608120 0 FreeSans 8000 0 0 0 REF
 rlabel metal3 17070 688210 41870 689330 1 OUT0
 rlabel metal3 43180 688360 70760 689480 1 OUT180
+flabel metal3 163400 360000 198200 362000 0 FreeSans 8000 0 0 0 txinb
+flabel metal3 163400 466000 198200 468000 0 FreeSans 8000 0 0 0 txina
+rlabel metal2 56980 508120 57120 660100 1 CTRL1
+flabel metal4 22200 605800 23800 611800 0 FreeSans 8000 90 0 0 REF
+rlabel metal2 55960 335420 56100 662700 1 CTRL5
+flabel metal2 148200 430920 148420 435520 0 FreeSans 16000 90 0 0 REF2
 << properties >>
 string FIXED_BBOX 0 0 584000 704000
 << end >>