diff --git a/bin/ckt b/bin/ckt
index 31f3c14..2372a4c 160000
--- a/bin/ckt
+++ b/bin/ckt
@@ -1 +1 @@
-Subproject commit 31f3c1407e4134dda16087b123bf59a88da10020
+Subproject commit 2372a4c7b61913add7dbf86f58a3b2f7e1f92021
diff --git a/lib/phy b/lib/phy
index 46a3d7c..42c1be8 160000
--- a/lib/phy
+++ b/lib/phy
@@ -1 +1 @@
-Subproject commit 46a3d7cea9096e0814f3557bbcd9ae1bde63831c
+Subproject commit 42c1be8aed730bbb755bd00e7e62da8d84ed22c4
diff --git a/tech/sky130/tech.py b/tech/sky130/tech.py
index b94992a..d3dcf88 100755
--- a/tech/sky130/tech.py
+++ b/tech/sky130/tech.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python3
-
 from loom import *
 
 AL = 0  # do not change
@@ -268,6 +266,8 @@
 nvtn = paint("nvtn", 251, 0)
 
 # Define DRC Rules
+difftap = b_or(diff, tap)
+
 fill(nwell)
 fill(nwell_pin)
 fill(nwell_label)
@@ -276,6 +276,7 @@
 fill(lvtn)
 fill(nsdm)
 fill(psdm)
+fill(hvi)
 fill(pwell_pin)
 fill(pwell_label)
 width(diff, 30)
@@ -343,6 +344,17 @@
 spacing(b_and(licon1, poly), b_or(diff, tap), 38)
 spacing(b_and(poly, b_not(diff)), diff, 15)
 
+width(hvi, 120)
+spacing(hvi, hvi, 140)
+#spacing(b_and(hvi, nwell), nwell, 400)
+#width(b_and(b_and(diff, hvi), b_not(b_and(psdm, diff))), 58)
+#width(b_and(b_and(diff, hvi), b_and(psdm, diff)), 30)
+enclosing(hvi, b_and(difftap, nwell), 66)
+spacing(b_and(hvi, nwell), difftap, 86)
+enclosing(hvi, difftap, 36)
+spacing(hvi, difftap, 36)
+#spacing(b_and(b_and(hvi, diff), b_not(nwell)), nwell, 86)
+
 bound(areaid_sc)
 
 # Define Routing and Device Models