diff --git a/comparator/comparator.mag b/comparator/comparator.mag
index 41166d9..80e61c8 100644
--- a/comparator/comparator.mag
+++ b/comparator/comparator.mag
@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1632928825
+timestamp 1633173780
 << nwell >>
 rect 210 -330 730 240
 rect 930 -770 1320 -140
@@ -22,7 +22,7 @@
 rect 990 -460 1008 -160
 rect 1060 -460 1078 -160
 rect 990 -750 1005 -550
-<< mvnmos >>
+<< nnmos >>
 rect 20 110 120 170
 rect 20 0 120 60
 rect 20 -190 120 -130
diff --git a/comparator/comparator.spice b/comparator/comparator.spice
index 1274051..4efcf0a 100644
--- a/comparator/comparator.spice
+++ b/comparator/comparator.spice
@@ -1,37 +1,26 @@
-* SPICE3 file created from /mnt/c/Users/Harry/magic-practice/caravel_user_project_analog/comparator/comparator.ext - technology: sky130A
+* SPICE3 file created from comparator.ext - technology: sky130A
 
-.subckt comparator VGND VDD3v3 VDD1v8 VOUT BIASN VN VP VPAMP VNAMP ISINK
-X9 VPAMP VPAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X15 VNAMP VNAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-
-X1 VGND BIASN ISINK VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X10 ISINK BIASN VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-
+.subckt comparator VGND VDD3v3 VDD1v8 VOUT BIASN VN VP
 X0 VPAMP VP ISINK VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X5 ISINK VN VNAMP VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-
+X1 VGND BIASN ISINK VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X2 VOPAMP VOP DIFFSINK VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-X3 VON VNAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X4 DECISINK VON VOP VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-
+X3 DECISINK VON VOP VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X4 VON VNAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+X5 ISINK VN VNAMP VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X6 DECISINK VOP VON VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X7 VDD1v8 VOPAMP VOUT VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=2e+06u l=150000u
 X8 DIFFSINK VONAMP VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
-
-
-
-
+X9 VPAMP VPAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+X10 ISINK BIASN VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X11 DIFFSINK VON VONAMP VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
 X12 VON VON DECISINK VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X13 VOPAMP VONAMP VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=180000u
 X14 VOUT VOPAMP VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=150000u
-
-
-
+X15 VDD3v3 VNAMP VNAMP VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
 X16 VOP VOP DECISINK VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X17 DECISINK DECISINK VGND VGND sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
 X18 VDD3v3 VPAMP VOP VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
 X19 VDD1v8 VONAMP VONAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=180000u
-*C0 VOPAMP VGND 2.89fF
-*C1 VON VGND 2.03fF
+C0 VOPAMP VGND 2.89fF
+C1 VON VGND 2.03fF
 .ends
diff --git a/comparator/simulation.spice b/comparator/simulation.spice
index 698e711..6442716 100644
--- a/comparator/simulation.spice
+++ b/comparator/simulation.spice
@@ -8,7 +8,7 @@
 
 
 * instantiate the comparator
-Xcomp VGND VDD3v3 VDD1v8 VOUT BIASN VN VP VPAMP1 VNAMP1 ISINK comparator
+Xcomp VGND VDD3v3 VDD1v8 VOUT BIASN VN VP comparator
 Xpre VP VN VPAMP VNAMP VI BIASN VGND VDD3v3 comparator-preamp
 Xdec VPAMP VNAMP VOP VON VGND VDD3v3 comparator-decision
 Xdiff VOP VON VOUT2 VGND VDD1v8 comparator-diffamp
diff --git a/comparator/sky130_fd_pr__nfet_03v3_nvt_DHUYC7.mag b/comparator/sky130_fd_pr__nfet_03v3_nvt_DHUYC7.mag
new file mode 100644
index 0000000..ef8ce23
--- /dev/null
+++ b/comparator/sky130_fd_pr__nfet_03v3_nvt_DHUYC7.mag
@@ -0,0 +1,51 @@
+magic
+tech sky130A
+timestamp 1633173629
+<< pwell >>
+rect -80 -50 80 210
+<< nnmos >>
+rect -30 90 20 190
+rect -25 -21 25 21
+<< mvndiff >>
+rect -70 180 -30 190
+rect -70 100 -60 180
+rect -40 100 -30 180
+rect -70 90 -30 100
+rect 20 180 60 190
+rect 20 100 30 180
+rect 50 100 60 180
+rect 20 90 60 100
+rect -55 15 -25 21
+rect -55 -15 -49 15
+rect -31 -15 -25 15
+rect -55 -21 -25 -15
+rect 25 15 55 21
+rect 25 -15 31 15
+rect 49 -15 55 15
+rect 25 -21 55 -15
+<< mvndiffc >>
+rect -60 100 -40 180
+rect 30 100 50 180
+rect -49 -15 -31 15
+rect 31 -15 49 15
+<< poly >>
+rect -30 190 20 210
+rect -30 70 20 90
+rect -25 21 25 34
+rect -25 -34 25 -21
+<< locali >>
+rect -70 180 -40 190
+rect -70 100 -60 180
+rect -70 90 -40 100
+rect 30 180 60 190
+rect 50 100 60 180
+rect 30 90 60 100
+rect -50 15 -30 30
+rect -50 -15 -49 15
+rect -31 -15 -30 15
+rect -50 -30 -30 -15
+rect 30 15 50 30
+rect 30 -15 31 15
+rect 49 -15 50 15
+rect 30 -30 50 -15
+<< end >>
diff --git a/comparator/sky130_fd_pr__nfet_03v3_nvt_DHUYC7.spice b/comparator/sky130_fd_pr__nfet_03v3_nvt_DHUYC7.spice
new file mode 100644
index 0000000..7e11f3f
--- /dev/null
+++ b/comparator/sky130_fd_pr__nfet_03v3_nvt_DHUYC7.spice
@@ -0,0 +1,4 @@
+* SPICE3 file created from sky130_fd_pr__nfet_03v3_nvt_DHUYC7.ext - technology: sky130A
+
+X0 a_25_n21# a_n25_n34# a_n55_n21# w_n80_n50# sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=420000u l=500000u
+X1 a_20_90# a_n30_70# a_n70_90# w_n80_n50# sky130_fd_pr__nfet_03v3_nvt ad=0p pd=0u as=0p ps=0u w=1e+06u l=500000u