diff --git a/flash_array/flash_array_2x4.mag b/flash_array/flash_array_2x4.mag
index a894206..ae65086 100644
--- a/flash_array/flash_array_2x4.mag
+++ b/flash_array/flash_array_2x4.mag
@@ -1,8 +1,77 @@
 magic
 tech sky130A
-timestamp 1633201778
+timestamp 1633983454
+<< dnwell >>
+rect -1700 0 -500 800
+<< pwell >>
+rect -1600 100 -500 700
+<< psubdiff >>
+rect -650 510 -530 530
+rect -650 240 -630 510
+rect -550 240 -530 510
+rect -650 220 -530 240
+<< psubdiffcont >>
+rect -630 240 -550 510
+<< locali >>
+rect -1470 390 -1380 850
+rect -1340 450 -1250 850
+rect -1210 390 -1120 850
+rect -1470 290 -1350 390
+rect -1240 290 -1120 390
+rect -1070 390 -980 850
+rect -940 450 -850 850
+rect -810 390 -720 850
+rect -440 800 -260 850
+rect -170 800 -50 850
+rect -20 800 40 850
+rect 70 800 110 850
+rect 150 800 190 850
+rect 240 800 285 850
+rect 305 800 350 850
+rect 390 800 430 850
+rect 470 800 510 850
+rect -1070 290 -950 390
+rect -840 290 -720 390
+rect -650 510 -530 530
+rect -650 240 -630 510
+rect -550 240 -530 510
+rect 700 430 800 850
+rect 850 320 950 850
+rect -650 220 -530 240
+rect -1400 160 -530 220
+rect -650 -60 -530 160
+rect -170 -60 -50 270
+rect 700 220 950 320
+rect -650 -180 -50 -60
+use sky130_fd_bs_flash__special_sonosfet_star_JJF9VQ  sky130_fd_bs_flash__special_sonosfet_star_JJF9VQ_1
+timestamp 1633982189
+transform 1 0 -1298 0 1 340
+box -102 -140 108 150
+use sky130_fd_bs_flash__special_sonosfet_star_JJF9VQ  sky130_fd_bs_flash__special_sonosfet_star_JJF9VQ_0
+timestamp 1633982189
+transform 1 0 -898 0 1 340
+box -102 -140 108 150
 use sky130_fd_bs_flash__special_sonosfet_star_VH7TJW  sky130_fd_bs_flash__special_sonosfet_star_VH7TJW_0
-timestamp 1633201778
+timestamp 1633983039
 transform 1 0 291 0 1 371
 box -791 -371 409 429
+<< labels >>
+rlabel locali -440 830 -260 850 1 DNWELL
+port 1 n
+rlabel locali -170 830 -50 850 1 PWELL
+port 2 n
+rlabel locali -20 830 40 850 1 ARRAY_SOURCE
+port 3 n
+rlabel locali -1340 830 -1250 850 1 FG0
+port 4 n
+rlabel locali -940 830 -850 850 1 FG1
+port 5 n
+rlabel locali -1470 830 -1380 850 1 FS0
+port 6 n
+rlabel locali -1210 830 -1120 850 1 FD0
+port 7 n
+rlabel locali -1070 830 -980 850 1 FS1
+port 8 n
+rlabel locali -810 830 -720 850 1 FD1
+port 9 n
 << end >>
diff --git a/flash_array/sky130_fd_bs_flash__special_sonosfet_star_JJF9VQ.mag b/flash_array/sky130_fd_bs_flash__special_sonosfet_star_JJF9VQ.mag
new file mode 100644
index 0000000..09accc3
--- /dev/null
+++ b/flash_array/sky130_fd_bs_flash__special_sonosfet_star_JJF9VQ.mag
@@ -0,0 +1,53 @@
+magic
+tech sky130A
+timestamp 1633982189
+<< nsonos >>
+rect -7 -50 9 50
+<< ndiff >>
+rect -52 40 -7 50
+rect -52 -40 -42 40
+rect -22 -40 -7 40
+rect -52 -50 -7 -40
+rect 9 40 58 50
+rect 9 -40 28 40
+rect 48 -40 58 40
+rect 9 -50 58 -40
+<< ndiffc >>
+rect -42 -40 -22 40
+rect 28 -40 48 40
+<< psubdiff >>
+rect -102 130 108 150
+rect -102 -120 -82 130
+rect 88 -120 108 130
+rect -102 -140 -42 -120
+rect 48 -140 108 -120
+<< psubdiffcont >>
+rect -42 -140 48 -120
+<< poly >>
+rect -22 100 28 110
+rect -22 80 -12 100
+rect 18 80 28 100
+rect -22 70 28 80
+rect -7 50 9 70
+rect -7 -70 9 -50
+<< polycont >>
+rect -12 80 18 100
+<< locali >>
+rect -22 100 28 110
+rect -22 80 -12 100
+rect 18 80 28 100
+rect -22 70 28 80
+rect -52 40 -22 50
+rect -52 -40 -42 40
+rect -52 -50 -22 -40
+rect 28 40 58 50
+rect 48 -40 58 40
+rect 28 -50 58 -40
+rect -52 -140 -42 -120
+rect 48 -140 58 -120
+<< properties >>
+string gencell sky130_fd_bs_flash__special_sonosfet_star
+string FIXED_BBOX -82 -130 82 130
+string parameters w 1 l 0.18 m 1 nf 1 diffcov 100 polycov 100 guard 1 glc 0 grc 0 gtc 0 gbc 1 tbcov 100 rlcov 100 topc 1 botc 1 poverlap 0 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
+string library sky130
+<< end >>
diff --git a/flash_array/sky130_fd_bs_flash__special_sonosfet_star_VH7TJW.mag b/flash_array/sky130_fd_bs_flash__special_sonosfet_star_VH7TJW.mag
index 82b2efd..1613647 100644
--- a/flash_array/sky130_fd_bs_flash__special_sonosfet_star_VH7TJW.mag
+++ b/flash_array/sky130_fd_bs_flash__special_sonosfet_star_VH7TJW.mag
@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1633201778
+timestamp 1633983039
 << dnwell >>
 rect -791 -371 409 429
 << nwell >>
@@ -165,10 +165,12 @@
 rect -461 -151 -341 -131
 rect -311 159 -251 429
 rect -221 219 -181 429
+rect -141 359 -111 429
+rect -141 329 -61 359
 rect -221 199 -211 219
 rect -191 199 -181 219
 rect -221 189 -181 199
-rect -96 219 -61 429
+rect -96 219 -61 329
 rect -36 279 -6 429
 rect -36 259 -31 279
 rect -11 259 -6 279
@@ -177,7 +179,9 @@
 rect -71 199 -61 219
 rect -96 189 -61 199
 rect 14 219 44 429
-rect 64 279 94 429
+rect 109 359 139 429
+rect 64 329 139 359
+rect 64 279 94 329
 rect 64 259 69 279
 rect 89 259 94 279
 rect 64 249 94 259