new comparator layout
diff --git a/EXPORT_BEFORE_PRECHECK.txt b/EXPORT_BEFORE_PRECHECK.txt
new file mode 100644
index 0000000..ae1c214
--- /dev/null
+++ b/EXPORT_BEFORE_PRECHECK.txt
@@ -0,0 +1,2 @@
+export PDK_ROOT=~
+export CARAVEL_ROOT=~/caravel
\ No newline at end of file
diff --git a/comparator/comparator.gds b/comparator/comparator.gds
deleted file mode 100644
index 80c6f3e..0000000
--- a/comparator/comparator.gds
+++ /dev/null
Binary files differ
diff --git a/comparator/comparator.mag b/comparator/comparator.mag
index 70d89f6..0d339c0 100644
--- a/comparator/comparator.mag
+++ b/comparator/comparator.mag
@@ -1,12 +1,18 @@
 magic
 tech sky130A
-timestamp 1632880394
+timestamp 1632918758
 << nwell >>
 rect 210 -330 730 240
 rect 920 -770 1320 -140
 << pwell >>
-rect -250 -440 140 230
-rect -250 -1060 510 -440
+rect -250 -190 140 230
+rect -310 -240 140 -190
+rect -250 -270 140 -240
+rect -250 -1040 -230 -270
+rect -215 -1025 -115 -285
+rect -110 -440 140 -270
+rect -110 -1040 510 -440
+rect -250 -1060 510 -1040
 << nmos >>
 rect 280 -810 298 -710
 rect 350 -810 368 -710
@@ -195,9 +201,11 @@
 rect 260 -190 390 -160
 rect 260 -280 390 -260
 << psubdiff >>
-rect -230 195 -100 210
-rect -230 -1025 -215 195
-rect -115 -1025 -100 195
+rect -230 -160 -215 -40
+rect -115 -160 -100 -40
+rect -230 -285 -100 -270
+rect -230 -1025 -215 -285
+rect -115 -1025 -100 -285
 rect -230 -1040 -100 -1025
 << nsubdiff >>
 rect 600 185 710 200
@@ -209,19 +217,26 @@
 rect 1285 -735 1300 -175
 rect 1200 -750 1300 -735
 << psubdiffcont >>
-rect -215 -1025 -115 195
+rect -215 -160 -115 -40
+rect -215 -1025 -115 -285
 << nsubdiffcont >>
 rect 615 -275 695 185
 rect 1215 -735 1285 -175
 << poly >>
-rect -10 110 20 170
+rect -60 160 20 170
+rect -60 120 -50 160
+rect -10 120 20 160
+rect -60 110 20 120
 rect 120 110 150 170
 rect 220 110 250 160
 rect 400 150 550 160
 rect 400 130 440 150
 rect 460 130 550 150
 rect 400 110 550 130
-rect -10 0 20 60
+rect -60 50 20 60
+rect -60 10 -50 50
+rect -10 10 20 50
+rect -60 0 20 10
 rect 120 0 150 60
 rect 220 10 250 60
 rect 400 40 470 60
@@ -229,13 +244,16 @@
 rect 460 20 470 40
 rect 400 10 470 20
 rect 420 -100 470 10
-rect -40 -190 20 -130
+rect -50 -190 20 -130
 rect 120 -190 150 -130
 rect 220 -150 250 -100
 rect 400 -150 470 -100
-rect -40 -240 0 -190
+rect -50 -200 0 -190
+rect -50 -230 -40 -200
+rect -10 -230 0 -200
+rect -50 -240 0 -230
 rect 500 -200 550 110
-rect -40 -300 20 -240
+rect -50 -300 20 -240
 rect 120 -300 150 -240
 rect 220 -250 250 -200
 rect 400 -250 550 -200
@@ -305,8 +323,11 @@
 rect 60 -990 78 -960
 rect 190 -1060 205 -1030
 << polycont >>
+rect -50 120 -10 160
 rect 440 130 460 150
+rect -50 10 -10 50
 rect 440 20 460 40
+rect -40 -230 -10 -200
 rect 990 -130 1010 -110
 rect 170 -390 200 -360
 rect 0 -630 20 -610
@@ -318,17 +339,24 @@
 rect 810 -830 850 -790
 rect 1070 -830 1110 -790
 << locali >>
-rect -110 -90 -100 210
 rect 20 200 470 210
 rect 20 180 30 200
 rect 110 190 470 200
 rect 110 180 260 190
 rect 250 170 260 180
 rect 390 170 470 190
+rect -430 160 0 170
+rect -430 120 -50 160
+rect -10 120 0 160
 rect 430 150 470 170
 rect 430 130 440 150
 rect 460 130 470 150
 rect 430 120 470 130
+rect -430 110 0 120
+rect -430 50 0 60
+rect -430 10 -50 50
+rect -10 10 0 50
+rect -430 0 0 10
 rect 430 40 470 50
 rect 430 20 440 40
 rect 460 20 470 40
@@ -339,13 +367,18 @@
 rect 390 -20 470 0
 rect 110 -30 470 -20
 rect 20 -40 470 -30
+rect -110 -90 -100 -40
 rect 170 -70 400 -60
 rect 170 -90 260 -70
 rect 390 -90 400 -70
 rect -20 -100 120 -90
 rect -20 -120 30 -100
 rect 110 -120 120 -100
-rect -110 -1040 -100 -120
+rect -110 -160 -100 -120
+rect -430 -200 -10 -190
+rect -430 -230 -40 -200
+rect -430 -240 -10 -230
+rect -110 -1040 -100 -270
 rect 170 -350 200 -90
 rect 250 -280 260 -260
 rect 390 -280 400 -260
@@ -414,26 +447,29 @@
 rect 1060 -840 1120 -830
 rect 150 -940 180 -930
 rect 150 -1000 160 -940
-rect 940 -960 1150 -900
+rect 940 -960 1450 -900
 rect 250 -1000 530 -960
-rect 570 -1000 1150 -960
+rect 570 -1000 1450 -960
 << viali >>
-rect -230 195 -110 210
-rect -230 -1025 -215 195
-rect -215 -1025 -115 195
-rect -115 -90 -110 195
 rect 20 70 30 100
 rect 30 70 110 100
 rect 110 70 120 100
 rect 250 70 260 100
 rect 260 70 390 100
 rect 390 70 400 100
+rect -230 -160 -215 -40
+rect -215 -160 -115 -40
+rect -115 -90 -110 -40
 rect -115 -120 -20 -90
-rect -115 -1025 -110 -120
-rect -230 -1040 -110 -1025
+rect -115 -160 -110 -120
 rect 20 -230 30 -200
 rect 30 -230 110 -200
 rect 110 -230 120 -200
+rect -230 -285 -110 -270
+rect -230 -1025 -215 -285
+rect -215 -1025 -115 -285
+rect -115 -1025 -110 -285
+rect -230 -1040 -110 -1025
 rect 20 -330 30 -310
 rect 30 -330 110 -310
 rect 110 -330 120 -310
@@ -497,18 +533,19 @@
 rect 530 -1000 570 -960
 rect 220 -1030 250 -1020
 << metal1 >>
-rect -400 210 -100 300
-rect -400 -1040 -230 210
-rect -110 -80 -100 210
+rect -400 -40 -100 300
 rect 600 200 800 300
 rect 600 120 610 200
+rect -400 -160 -230 -40
+rect -110 -80 -100 -40
 rect 10 100 130 110
 rect 10 70 20 100
 rect 120 70 130 100
 rect -110 -90 -10 -80
 rect -20 -120 -10 -90
 rect -110 -130 -10 -120
-rect -110 -300 -100 -130
+rect -110 -160 -100 -130
+rect -400 -270 -100 -160
 rect 10 -200 130 70
 rect 240 100 610 120
 rect 240 70 250 100
@@ -522,6 +559,8 @@
 rect 10 -230 20 -200
 rect 120 -230 130 -200
 rect 10 -240 130 -230
+rect -400 -1040 -230 -270
+rect -110 -300 -100 -270
 rect 600 -290 610 -200
 rect 710 -290 800 200
 rect 1200 -150 1400 300
@@ -586,20 +625,12 @@
 rect 1000 -760 1400 -750
 rect 1200 -1100 1400 -760
 << labels >>
-rlabel poly -30 -220 -10 -190 1 BIASN
-port 5 n
 rlabel metal1 -400 -1100 -100 -1080 1 VGND
 port 1 n
 rlabel metal1 600 -1100 800 -1080 1 VDD3v3
 port 2 n
 rlabel metal1 1200 -1100 1400 -1080 1 VDD1v8
 port 3 n
-rlabel locali 1040 -990 1110 -940 1 VOUT
-port 4 n
-rlabel poly -10 110 0 170 1 VP
-port 7 n
-rlabel poly -10 0 0 60 1 VN
-port 6 n
 rlabel locali 540 -800 560 -780 1 VOPAMP
 rlabel locali 400 -650 420 -630 1 VOP
 rlabel locali 170 190 190 210 1 VPAMP
@@ -609,4 +640,18 @@
 rlabel metal1 140 -650 150 -640 1 DECISINK
 rlabel locali 540 -900 570 -880 1 VONAMP
 rlabel metal1 140 -890 170 -860 1 DIFFSINK
+rlabel metal1 -400 280 -100 300 1 VGND
+port 1 n
+rlabel locali -430 110 -410 170 1 VP
+port 7 n
+rlabel locali -430 0 -410 60 1 VN
+port 6 n
+rlabel locali -430 -240 -410 -190 1 BIASN
+port 5 n
+rlabel locali 1430 -1000 1450 -900 1 VOUT
+port 4 n
+rlabel metal1 600 280 800 300 1 VDD3v3
+port 2 n
+rlabel metal1 1200 280 1400 300 1 VDD1v8
+port 3 n
 << end >>
diff --git a/gds/comparator.gds b/gds/comparator.gds
new file mode 100644
index 0000000..be37cda
--- /dev/null
+++ b/gds/comparator.gds
Binary files differ
diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index b737cf2..6bb65fc 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/gds/user_analog_project_wrapper_empty.gds b/gds/user_analog_project_wrapper_empty.gds
new file mode 100644
index 0000000..6bb65fc
--- /dev/null
+++ b/gds/user_analog_project_wrapper_empty.gds
Binary files differ
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 688a706..6e9400f 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,44 @@
 magic
 tech sky130A
-timestamp 1632873076
+timestamp 1632920072
+<< locali >>
+rect 1320 49160 1490 49220
+rect 1320 49050 1490 49110
+rect 1130 48810 1490 48860
+<< viali >>
+rect 1320 49220 1380 49280
+rect 1320 48990 1380 49050
+rect 1070 48810 1130 48860
+<< metal1 >>
+rect 1310 49280 1390 49290
+rect 1310 49220 1320 49280
+rect 1380 49220 1390 49280
+rect 1310 49210 1390 49220
+rect 1310 49050 1390 49060
+rect 1310 48990 1320 49050
+rect 1380 48990 1390 49050
+rect 1310 48980 1390 48990
+rect 1060 48860 1140 48870
+rect 1060 48810 1070 48860
+rect 1130 48810 1140 48860
+rect 1060 48800 1140 48810
+<< via1 >>
+rect 1320 49220 1380 49280
+rect 1320 48990 1380 49050
+rect 1070 48810 1130 48860
 << metal2 >>
+rect 1310 49280 1390 49290
+rect 1310 49220 1320 49280
+rect 1380 49220 1390 49280
+rect 1310 49210 1390 49220
+rect 1310 49050 1390 49060
+rect 1310 48990 1320 49050
+rect 1380 48990 1390 49050
+rect 1310 48980 1390 48990
+rect 1060 48860 1140 48870
+rect 1060 48810 1070 48860
+rect 1130 48810 1140 48860
+rect 1060 48800 1140 48810
 rect 262 -400 318 240
 rect 853 -400 909 240
 rect 1444 -400 1500 240
@@ -496,6 +533,10 @@
 rect 290443 -400 290499 240
 rect 291034 -400 291090 240
 rect 291625 -400 291681 240
+<< via2 >>
+rect 1320 49220 1380 49280
+rect 1320 48990 1380 49050
+rect 1070 48810 1130 48860
 << metal3 >>
 rect 8097 351150 10597 352400
 rect 34097 351150 36597 352400
@@ -621,27 +662,45 @@
 rect -400 81444 830 83844
 rect 291170 73415 292400 75815
 rect 291170 68415 292400 70815
-rect -400 62388 240 62444
+rect -400 62388 648 62444
 rect -400 61797 240 61853
 rect -400 61206 240 61262
 rect -400 60615 240 60671
 rect -400 60024 240 60080
 rect -400 59433 240 59489
-rect 291760 47559 292400 47615
-rect 291760 46968 292400 47024
-rect 291760 46377 292400 46433
-rect 291760 45786 292400 45842
-rect -400 40777 240 40833
+rect 592 49278 648 62388
+rect 1310 49280 1390 49290
+rect 1310 49278 1320 49280
+rect 592 49222 1320 49278
+rect 1310 49220 1320 49222
+rect 1380 49220 1390 49280
+rect 1310 49210 1390 49220
+rect 1310 49050 1390 49060
+rect 592 48994 1320 49050
+rect 592 40833 648 48994
+rect 1310 48990 1320 48994
+rect 1380 48990 1390 49050
+rect 1310 48980 1390 48990
+rect 1060 48860 1140 48870
+rect 1060 48810 1070 48860
+rect 1130 48810 1140 48860
+rect 1060 48800 1140 48810
+rect -400 40777 648 40833
 rect -400 40186 240 40242
 rect -400 39595 240 39651
 rect -400 39004 240 39060
 rect -400 38413 240 38469
 rect -400 37822 240 37878
+rect 1072 19222 1128 48800
+rect 291760 47559 292400 47615
+rect 291760 46968 292400 47024
+rect 291760 46377 292400 46433
+rect 291760 45786 292400 45842
 rect 291760 25230 292400 25286
 rect 291760 24639 292400 24695
 rect 291760 24048 292400 24104
 rect 291760 23457 292400 23513
-rect -400 19166 240 19222
+rect -400 19166 1128 19222
 rect -400 18575 240 18631
 rect -400 17984 240 18040
 rect -400 17393 240 17449
@@ -687,9 +746,9 @@
 rect 292000 0 292050 352000
 rect -50 -50 292050 0
 use comparator  comparator_0
-timestamp 1632872871
-transform 1 0 2220 0 1 49050
-box -40 -1060 510 220
+timestamp 1632918758
+transform 1 0 1920 0 1 49050
+box -430 -1100 1450 300
 << labels >>
 flabel metal3 s 291760 134615 292400 134671 0 FreeSans 560 0 0 0 gpio_analog[0]
 port 0 nsew signal bidirectional