diff --git a/gds/Marmot.gds.gz b/gds/Marmot.gds.gz
index ec443d6..173c0ad 100644
--- a/gds/Marmot.gds.gz
+++ b/gds/Marmot.gds.gz
Binary files differ
diff --git a/lef/Marmot.lef b/lef/Marmot.lef
index 35f58d6..314c4a4 100644
--- a/lef/Marmot.lef
+++ b/lef/Marmot.lef
@@ -4020,11 +4020,27 @@
     USE POWER ;
     PORT
       LAYER met4 ;
-        RECT 8.970 10.640 12.070 3468.240 ;
+        RECT -11.580 -6.220 -8.480 3485.100 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT -11.580 -6.220 2891.180 -3.120 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT -11.580 3482.000 2891.180 3485.100 ;
     END
     PORT
       LAYER met4 ;
-        RECT 188.970 10.640 192.070 1260.000 ;
+        RECT 2888.080 -6.220 2891.180 3485.100 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 8.970 -11.020 12.070 3489.900 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 188.970 -11.020 192.070 1260.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4040,11 +4056,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 188.970 3376.540 192.070 3468.240 ;
+        RECT 188.970 3376.540 192.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 368.970 10.640 372.070 1260.000 ;
+        RECT 368.970 -11.020 372.070 1260.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4060,11 +4076,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 368.970 3376.540 372.070 3468.240 ;
+        RECT 368.970 3376.540 372.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 548.970 10.640 552.070 1260.000 ;
+        RECT 548.970 -11.020 552.070 1260.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4080,11 +4096,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 548.970 3376.540 552.070 3468.240 ;
+        RECT 548.970 3376.540 552.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 728.970 10.640 732.070 1260.000 ;
+        RECT 728.970 -11.020 732.070 1260.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4100,39 +4116,39 @@
     END
     PORT
       LAYER met4 ;
-        RECT 728.970 3376.540 732.070 3468.240 ;
+        RECT 728.970 3376.540 732.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 908.970 10.640 912.070 2940.000 ;
+        RECT 908.970 -11.020 912.070 2940.000 ;
     END
     PORT
       LAYER met4 ;
-        RECT 908.970 3357.500 912.070 3468.240 ;
+        RECT 908.970 3357.500 912.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1088.970 10.640 1092.070 2940.000 ;
+        RECT 1088.970 -11.020 1092.070 2940.000 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1088.970 3357.500 1092.070 3468.240 ;
+        RECT 1088.970 3357.500 1092.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1268.970 10.640 1272.070 2940.000 ;
+        RECT 1268.970 -11.020 1272.070 2940.000 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1268.970 3357.500 1272.070 3468.240 ;
+        RECT 1268.970 3357.500 1272.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1448.970 10.640 1452.070 3468.240 ;
+        RECT 1448.970 -11.020 1452.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1628.970 10.640 1632.070 140.000 ;
+        RECT 1628.970 -11.020 1632.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4140,11 +4156,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 1628.970 3357.500 1632.070 3468.240 ;
+        RECT 1628.970 3357.500 1632.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1808.970 10.640 1812.070 140.000 ;
+        RECT 1808.970 -11.020 1812.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4152,15 +4168,15 @@
     END
     PORT
       LAYER met4 ;
-        RECT 1808.970 3357.500 1812.070 3468.240 ;
+        RECT 1808.970 3357.500 1812.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1988.970 10.640 1992.070 3468.240 ;
+        RECT 1988.970 -11.020 1992.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2168.970 10.640 2172.070 140.000 ;
+        RECT 2168.970 -11.020 2172.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4184,11 +4200,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 2168.970 3376.540 2172.070 3468.240 ;
+        RECT 2168.970 3376.540 2172.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2348.970 10.640 2352.070 140.000 ;
+        RECT 2348.970 -11.020 2352.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4212,11 +4228,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 2348.970 3376.540 2352.070 3468.240 ;
+        RECT 2348.970 3376.540 2352.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2528.970 10.640 2532.070 140.000 ;
+        RECT 2528.970 -11.020 2532.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4240,11 +4256,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 2528.970 3376.540 2532.070 3468.240 ;
+        RECT 2528.970 3376.540 2532.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2708.970 10.640 2712.070 140.000 ;
+        RECT 2708.970 -11.020 2712.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4268,87 +4284,87 @@
     END
     PORT
       LAYER met4 ;
-        RECT 2708.970 3376.540 2712.070 3468.240 ;
+        RECT 2708.970 3376.540 2712.070 3489.900 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 14.330 2874.320 17.430 ;
+        RECT -16.380 14.330 2895.980 17.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 194.330 2874.320 197.430 ;
+        RECT -16.380 194.330 2895.980 197.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 374.330 2874.320 377.430 ;
+        RECT -16.380 374.330 2895.980 377.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 554.330 2874.320 557.430 ;
+        RECT -16.380 554.330 2895.980 557.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 734.330 2874.320 737.430 ;
+        RECT -16.380 734.330 2895.980 737.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 914.330 2874.320 917.430 ;
+        RECT -16.380 914.330 2895.980 917.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1094.330 2874.320 1097.430 ;
+        RECT -16.380 1094.330 2895.980 1097.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1274.330 2874.320 1277.430 ;
+        RECT -16.380 1274.330 2895.980 1277.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1454.330 2874.320 1457.430 ;
+        RECT -16.380 1454.330 2895.980 1457.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1634.330 2874.320 1637.430 ;
+        RECT -16.380 1634.330 2895.980 1637.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1814.330 2874.320 1817.430 ;
+        RECT -16.380 1814.330 2895.980 1817.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1994.330 2874.320 1997.430 ;
+        RECT -16.380 1994.330 2895.980 1997.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2174.330 2874.320 2177.430 ;
+        RECT -16.380 2174.330 2895.980 2177.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2354.330 2874.320 2357.430 ;
+        RECT -16.380 2354.330 2895.980 2357.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2534.330 2874.320 2537.430 ;
+        RECT -16.380 2534.330 2895.980 2537.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2714.330 2874.320 2717.430 ;
+        RECT -16.380 2714.330 2895.980 2717.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2894.330 2874.320 2897.430 ;
+        RECT -16.380 2894.330 2895.980 2897.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 3074.330 2874.320 3077.430 ;
+        RECT -16.380 3074.330 2895.980 3077.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 3254.330 2874.320 3257.430 ;
+        RECT -16.380 3254.330 2895.980 3257.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 3434.330 2874.320 3437.430 ;
+        RECT -16.380 3434.330 2895.980 3437.430 ;
     END
     PORT
       LAYER met4 ;
@@ -4392,7 +4408,23 @@
     USE GROUND ;
     PORT
       LAYER met4 ;
-        RECT 98.970 10.640 102.070 1260.000 ;
+        RECT -16.380 -11.020 -13.280 3489.900 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT -16.380 -11.020 2895.980 -7.920 ;
+    END
+    PORT
+      LAYER met5 ;
+        RECT -16.380 3486.800 2895.980 3489.900 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 2892.880 -11.020 2895.980 3489.900 ;
+    END
+    PORT
+      LAYER met4 ;
+        RECT 98.970 -11.020 102.070 1260.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4408,11 +4440,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 98.970 3376.540 102.070 3468.240 ;
+        RECT 98.970 3376.540 102.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 278.970 10.640 282.070 1260.000 ;
+        RECT 278.970 -11.020 282.070 1260.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4428,11 +4460,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 278.970 3376.540 282.070 3468.240 ;
+        RECT 278.970 3376.540 282.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 458.970 10.640 462.070 1260.000 ;
+        RECT 458.970 -11.020 462.070 1260.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4448,11 +4480,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 458.970 3376.540 462.070 3468.240 ;
+        RECT 458.970 3376.540 462.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 638.970 10.640 642.070 1260.000 ;
+        RECT 638.970 -11.020 642.070 1260.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4468,39 +4500,39 @@
     END
     PORT
       LAYER met4 ;
-        RECT 638.970 3376.540 642.070 3468.240 ;
+        RECT 638.970 3376.540 642.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 818.970 10.640 822.070 3468.240 ;
+        RECT 818.970 -11.020 822.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 998.970 10.640 1002.070 2940.000 ;
+        RECT 998.970 -11.020 1002.070 2940.000 ;
     END
     PORT
       LAYER met4 ;
-        RECT 998.970 3357.500 1002.070 3468.240 ;
+        RECT 998.970 3357.500 1002.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1178.970 10.640 1182.070 2940.000 ;
+        RECT 1178.970 -11.020 1182.070 2940.000 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1178.970 3357.500 1182.070 3468.240 ;
+        RECT 1178.970 3357.500 1182.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1358.970 10.640 1362.070 2940.000 ;
+        RECT 1358.970 -11.020 1362.070 2940.000 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1358.970 3357.500 1362.070 3468.240 ;
+        RECT 1358.970 3357.500 1362.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1538.970 10.640 1542.070 140.000 ;
+        RECT 1538.970 -11.020 1542.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4508,11 +4540,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 1538.970 3357.500 1542.070 3468.240 ;
+        RECT 1538.970 3357.500 1542.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1718.970 10.640 1722.070 140.000 ;
+        RECT 1718.970 -11.020 1722.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4520,11 +4552,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 1718.970 3357.500 1722.070 3468.240 ;
+        RECT 1718.970 3357.500 1722.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 1898.970 10.640 1902.070 140.000 ;
+        RECT 1898.970 -11.020 1902.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4532,15 +4564,15 @@
     END
     PORT
       LAYER met4 ;
-        RECT 1898.970 3357.500 1902.070 3468.240 ;
+        RECT 1898.970 3357.500 1902.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2078.970 10.640 2082.070 3468.240 ;
+        RECT 2078.970 -11.020 2082.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2258.970 10.640 2262.070 140.000 ;
+        RECT 2258.970 -11.020 2262.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4564,11 +4596,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 2258.970 3376.540 2262.070 3468.240 ;
+        RECT 2258.970 3376.540 2262.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2438.970 10.640 2442.070 140.000 ;
+        RECT 2438.970 -11.020 2442.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4592,11 +4624,11 @@
     END
     PORT
       LAYER met4 ;
-        RECT 2438.970 3376.540 2442.070 3468.240 ;
+        RECT 2438.970 3376.540 2442.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2618.970 10.640 2622.070 140.000 ;
+        RECT 2618.970 -11.020 2622.070 140.000 ;
     END
     PORT
       LAYER met4 ;
@@ -4620,87 +4652,87 @@
     END
     PORT
       LAYER met4 ;
-        RECT 2618.970 3376.540 2622.070 3468.240 ;
+        RECT 2618.970 3376.540 2622.070 3489.900 ;
     END
     PORT
       LAYER met4 ;
-        RECT 2798.970 10.640 2802.070 3468.240 ;
+        RECT 2798.970 -11.020 2802.070 3489.900 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 104.330 2874.320 107.430 ;
+        RECT -16.380 104.330 2895.980 107.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 284.330 2874.320 287.430 ;
+        RECT -16.380 284.330 2895.980 287.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 464.330 2874.320 467.430 ;
+        RECT -16.380 464.330 2895.980 467.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 644.330 2874.320 647.430 ;
+        RECT -16.380 644.330 2895.980 647.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 824.330 2874.320 827.430 ;
+        RECT -16.380 824.330 2895.980 827.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1004.330 2874.320 1007.430 ;
+        RECT -16.380 1004.330 2895.980 1007.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1184.330 2874.320 1187.430 ;
+        RECT -16.380 1184.330 2895.980 1187.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1364.330 2874.320 1367.430 ;
+        RECT -16.380 1364.330 2895.980 1367.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1544.330 2874.320 1547.430 ;
+        RECT -16.380 1544.330 2895.980 1547.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1724.330 2874.320 1727.430 ;
+        RECT -16.380 1724.330 2895.980 1727.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 1904.330 2874.320 1907.430 ;
+        RECT -16.380 1904.330 2895.980 1907.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2084.330 2874.320 2087.430 ;
+        RECT -16.380 2084.330 2895.980 2087.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2264.330 2874.320 2267.430 ;
+        RECT -16.380 2264.330 2895.980 2267.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2444.330 2874.320 2447.430 ;
+        RECT -16.380 2444.330 2895.980 2447.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2624.330 2874.320 2627.430 ;
+        RECT -16.380 2624.330 2895.980 2627.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2804.330 2874.320 2807.430 ;
+        RECT -16.380 2804.330 2895.980 2807.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 2984.330 2874.320 2987.430 ;
+        RECT -16.380 2984.330 2895.980 2987.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 3164.330 2874.320 3167.430 ;
+        RECT -16.380 3164.330 2895.980 3167.430 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 3344.330 2874.320 3347.430 ;
+        RECT -16.380 3344.330 2895.980 3347.430 ;
     END
     PORT
       LAYER met4 ;
@@ -4719,29 +4751,17 @@
         RECT 45.830 2377.040 48.930 2818.160 ;
     END
     PORT
-      LAYER met5 ;
-        RECT 818.970 3410.350 2082.070 3413.450 ;
-    END
-    PORT
       LAYER met4 ;
         RECT 45.830 2937.360 48.930 3378.480 ;
     END
     PORT
       LAYER met5 ;
-        RECT 5.280 3420.550 822.070 3423.650 ;
-    END
-    PORT
-      LAYER met5 ;
         RECT 5.280 2876.550 822.070 2879.650 ;
     END
     PORT
       LAYER met5 ;
         RECT 2078.970 2876.550 2802.070 2879.650 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 2078.970 3420.550 2802.070 3423.650 ;
-    END
   END vssd1
   PIN wb_clk_i
     DIRECTION INPUT ;
@@ -5595,38 +5615,38 @@
       LAYER li1 ;
         RECT 5.520 10.795 2874.080 3468.085 ;
       LAYER met1 ;
-        RECT 3.750 6.840 2874.080 3468.240 ;
+        RECT 4.670 6.840 2874.080 3468.240 ;
       LAYER met2 ;
-        RECT 3.770 3478.720 58.090 3479.290 ;
-        RECT 59.210 3478.720 164.350 3479.290 ;
-        RECT 165.470 3478.720 270.610 3479.290 ;
-        RECT 271.730 3478.720 376.870 3479.290 ;
-        RECT 377.990 3478.720 483.130 3479.290 ;
-        RECT 484.250 3478.720 589.390 3479.290 ;
-        RECT 590.510 3478.720 695.650 3479.290 ;
-        RECT 696.770 3478.720 801.910 3479.290 ;
-        RECT 803.030 3478.720 908.170 3479.290 ;
-        RECT 909.290 3478.720 1014.430 3479.290 ;
-        RECT 1015.550 3478.720 1120.690 3479.290 ;
-        RECT 1121.810 3478.720 1226.950 3479.290 ;
-        RECT 1228.070 3478.720 1333.210 3479.290 ;
-        RECT 1334.330 3478.720 1439.470 3479.290 ;
-        RECT 1440.590 3478.720 1545.730 3479.290 ;
-        RECT 1546.850 3478.720 1651.990 3479.290 ;
-        RECT 1653.110 3478.720 1758.250 3479.290 ;
-        RECT 1759.370 3478.720 1864.510 3479.290 ;
-        RECT 1865.630 3478.720 1970.770 3479.290 ;
-        RECT 1971.890 3478.720 2077.030 3479.290 ;
-        RECT 2078.150 3478.720 2183.290 3479.290 ;
-        RECT 2184.410 3478.720 2289.550 3479.290 ;
-        RECT 2290.670 3478.720 2395.810 3479.290 ;
-        RECT 2396.930 3478.720 2502.070 3479.290 ;
-        RECT 2503.190 3478.720 2608.330 3479.290 ;
-        RECT 2609.450 3478.720 2714.590 3479.290 ;
-        RECT 2715.710 3478.720 2820.850 3479.290 ;
-        RECT 2821.970 3478.720 2870.770 3479.290 ;
-        RECT 3.770 1.280 2870.770 3478.720 ;
-        RECT 3.770 0.270 81.550 1.280 ;
+        RECT 4.700 3478.720 58.090 3479.000 ;
+        RECT 59.210 3478.720 164.350 3479.000 ;
+        RECT 165.470 3478.720 270.610 3479.000 ;
+        RECT 271.730 3478.720 376.870 3479.000 ;
+        RECT 377.990 3478.720 483.130 3479.000 ;
+        RECT 484.250 3478.720 589.390 3479.000 ;
+        RECT 590.510 3478.720 695.650 3479.000 ;
+        RECT 696.770 3478.720 801.910 3479.000 ;
+        RECT 803.030 3478.720 908.170 3479.000 ;
+        RECT 909.290 3478.720 1014.430 3479.000 ;
+        RECT 1015.550 3478.720 1120.690 3479.000 ;
+        RECT 1121.810 3478.720 1226.950 3479.000 ;
+        RECT 1228.070 3478.720 1333.210 3479.000 ;
+        RECT 1334.330 3478.720 1439.470 3479.000 ;
+        RECT 1440.590 3478.720 1545.730 3479.000 ;
+        RECT 1546.850 3478.720 1651.990 3479.000 ;
+        RECT 1653.110 3478.720 1758.250 3479.000 ;
+        RECT 1759.370 3478.720 1864.510 3479.000 ;
+        RECT 1865.630 3478.720 1970.770 3479.000 ;
+        RECT 1971.890 3478.720 2077.030 3479.000 ;
+        RECT 2078.150 3478.720 2183.290 3479.000 ;
+        RECT 2184.410 3478.720 2289.550 3479.000 ;
+        RECT 2290.670 3478.720 2395.810 3479.000 ;
+        RECT 2396.930 3478.720 2502.070 3479.000 ;
+        RECT 2503.190 3478.720 2608.330 3479.000 ;
+        RECT 2609.450 3478.720 2714.590 3479.000 ;
+        RECT 2715.710 3478.720 2820.850 3479.000 ;
+        RECT 2821.970 3478.720 2870.770 3479.000 ;
+        RECT 4.700 1.280 2870.770 3478.720 ;
+        RECT 4.700 0.270 81.550 1.280 ;
         RECT 82.670 0.270 87.070 1.280 ;
         RECT 88.190 0.270 92.590 1.280 ;
         RECT 93.710 0.270 98.110 1.280 ;
@@ -6297,7 +6317,7 @@
         RECT 1.000 48.300 2878.600 50.300 ;
         RECT 1.000 10.715 2879.000 48.300 ;
       LAYER met4 ;
-        RECT 7.655 12.415 8.570 3467.145 ;
+        RECT 7.655 11.735 8.570 3467.145 ;
         RECT 12.470 3378.880 98.570 3467.145 ;
         RECT 12.470 2936.960 45.430 3378.880 ;
         RECT 49.330 3376.140 98.570 3378.880 ;
@@ -6350,15 +6370,15 @@
         RECT 732.470 1696.140 818.570 1820.400 ;
         RECT 49.330 1260.400 818.570 1696.140 ;
         RECT 49.330 1256.000 98.570 1260.400 ;
-        RECT 12.470 12.415 98.570 1256.000 ;
-        RECT 102.470 12.415 188.570 1260.400 ;
-        RECT 192.470 12.415 278.570 1260.400 ;
-        RECT 282.470 12.415 368.570 1260.400 ;
-        RECT 372.470 12.415 458.570 1260.400 ;
-        RECT 462.470 12.415 548.570 1260.400 ;
-        RECT 552.470 12.415 638.570 1260.400 ;
-        RECT 642.470 12.415 728.570 1260.400 ;
-        RECT 732.470 12.415 818.570 1260.400 ;
+        RECT 12.470 11.735 98.570 1256.000 ;
+        RECT 102.470 11.735 188.570 1260.400 ;
+        RECT 192.470 11.735 278.570 1260.400 ;
+        RECT 282.470 11.735 368.570 1260.400 ;
+        RECT 372.470 11.735 458.570 1260.400 ;
+        RECT 462.470 11.735 548.570 1260.400 ;
+        RECT 552.470 11.735 638.570 1260.400 ;
+        RECT 642.470 11.735 728.570 1260.400 ;
+        RECT 732.470 11.735 818.570 1260.400 ;
         RECT 822.470 3359.840 908.570 3467.145 ;
         RECT 822.470 2934.240 844.910 3359.840 ;
         RECT 848.810 3357.100 908.570 3359.840 ;
@@ -6371,15 +6391,15 @@
         RECT 1362.470 3357.100 1437.390 3362.560 ;
         RECT 848.810 2940.400 1437.390 3357.100 ;
         RECT 848.810 2934.240 908.570 2940.400 ;
-        RECT 822.470 12.415 908.570 2934.240 ;
-        RECT 912.470 12.415 998.570 2940.400 ;
-        RECT 1002.470 12.415 1088.570 2940.400 ;
-        RECT 1092.470 12.415 1178.570 2940.400 ;
-        RECT 1182.470 12.415 1268.570 2940.400 ;
-        RECT 1272.470 12.415 1358.570 2940.400 ;
+        RECT 822.470 11.735 908.570 2934.240 ;
+        RECT 912.470 11.735 998.570 2940.400 ;
+        RECT 1002.470 11.735 1088.570 2940.400 ;
+        RECT 1092.470 11.735 1178.570 2940.400 ;
+        RECT 1182.470 11.735 1268.570 2940.400 ;
+        RECT 1272.470 11.735 1358.570 2940.400 ;
         RECT 1362.470 2936.960 1437.390 2940.400 ;
         RECT 1441.290 2936.960 1448.570 3362.560 ;
-        RECT 1362.470 12.415 1448.570 2936.960 ;
+        RECT 1362.470 11.735 1448.570 2936.960 ;
         RECT 1452.470 3357.100 1538.570 3467.145 ;
         RECT 1542.470 3357.100 1628.570 3467.145 ;
         RECT 1632.470 3357.100 1718.570 3467.145 ;
@@ -6394,13 +6414,13 @@
         RECT 1812.470 557.100 1898.570 2940.400 ;
         RECT 1902.470 557.100 1988.570 2940.400 ;
         RECT 1452.470 140.400 1988.570 557.100 ;
-        RECT 1452.470 12.415 1538.570 140.400 ;
-        RECT 1542.470 12.415 1628.570 140.400 ;
-        RECT 1632.470 12.415 1718.570 140.400 ;
-        RECT 1722.470 12.415 1808.570 140.400 ;
-        RECT 1812.470 12.415 1898.570 140.400 ;
-        RECT 1902.470 12.415 1988.570 140.400 ;
-        RECT 1992.470 12.415 2078.570 3467.145 ;
+        RECT 1452.470 11.735 1538.570 140.400 ;
+        RECT 1542.470 11.735 1628.570 140.400 ;
+        RECT 1632.470 11.735 1718.570 140.400 ;
+        RECT 1722.470 11.735 1808.570 140.400 ;
+        RECT 1812.470 11.735 1898.570 140.400 ;
+        RECT 1902.470 11.735 1988.570 140.400 ;
+        RECT 1992.470 11.735 2078.570 3467.145 ;
         RECT 2082.470 3376.140 2168.570 3467.145 ;
         RECT 2172.470 3376.140 2258.570 3467.145 ;
         RECT 2262.470 3376.140 2348.570 3467.145 ;
@@ -6455,75 +6475,69 @@
         RECT 2622.470 576.140 2708.570 700.400 ;
         RECT 2712.470 576.140 2798.570 700.400 ;
         RECT 2082.470 140.400 2798.570 576.140 ;
-        RECT 2082.470 12.415 2168.570 140.400 ;
-        RECT 2172.470 12.415 2258.570 140.400 ;
-        RECT 2262.470 12.415 2348.570 140.400 ;
-        RECT 2352.470 12.415 2438.570 140.400 ;
-        RECT 2442.470 12.415 2528.570 140.400 ;
-        RECT 2532.470 12.415 2618.570 140.400 ;
-        RECT 2622.470 12.415 2708.570 140.400 ;
-        RECT 2712.470 12.415 2798.570 140.400 ;
-        RECT 2802.470 3381.600 2870.530 3467.145 ;
+        RECT 2082.470 11.735 2168.570 140.400 ;
+        RECT 2172.470 11.735 2258.570 140.400 ;
+        RECT 2262.470 11.735 2348.570 140.400 ;
+        RECT 2352.470 11.735 2438.570 140.400 ;
+        RECT 2442.470 11.735 2528.570 140.400 ;
+        RECT 2532.470 11.735 2618.570 140.400 ;
+        RECT 2622.470 11.735 2708.570 140.400 ;
+        RECT 2712.470 11.735 2798.570 140.400 ;
+        RECT 2802.470 3381.600 2868.690 3467.145 ;
         RECT 2802.470 2934.240 2831.190 3381.600 ;
-        RECT 2835.090 2934.240 2870.530 3381.600 ;
-        RECT 2802.470 2821.280 2870.530 2934.240 ;
+        RECT 2835.090 2934.240 2868.690 3381.600 ;
+        RECT 2802.470 2821.280 2868.690 2934.240 ;
         RECT 2802.470 2379.360 2831.190 2821.280 ;
-        RECT 2835.090 2379.360 2870.530 2821.280 ;
-        RECT 2802.470 2260.960 2870.530 2379.360 ;
+        RECT 2835.090 2379.360 2868.690 2821.280 ;
+        RECT 2802.470 2260.960 2868.690 2379.360 ;
         RECT 2802.470 1819.040 2831.190 2260.960 ;
-        RECT 2835.090 1819.040 2870.530 2260.960 ;
-        RECT 2802.470 1700.640 2870.530 1819.040 ;
+        RECT 2835.090 1819.040 2868.690 2260.960 ;
+        RECT 2802.470 1700.640 2868.690 1819.040 ;
         RECT 2802.470 1258.720 2831.190 1700.640 ;
-        RECT 2835.090 1258.720 2870.530 1700.640 ;
-        RECT 2802.470 1140.320 2870.530 1258.720 ;
+        RECT 2835.090 1258.720 2868.690 1700.640 ;
+        RECT 2802.470 1140.320 2868.690 1258.720 ;
         RECT 2802.470 698.400 2831.190 1140.320 ;
-        RECT 2835.090 698.400 2870.530 1140.320 ;
-        RECT 2802.470 580.000 2870.530 698.400 ;
+        RECT 2835.090 698.400 2868.690 1140.320 ;
+        RECT 2802.470 580.000 2868.690 698.400 ;
         RECT 2802.470 138.080 2831.190 580.000 ;
-        RECT 2835.090 138.080 2870.530 580.000 ;
-        RECT 2802.470 12.415 2870.530 138.080 ;
+        RECT 2835.090 138.080 2868.690 580.000 ;
+        RECT 2802.470 11.735 2868.690 138.080 ;
       LAYER met5 ;
-        RECT 88.900 3079.030 2870.740 3113.500 ;
-        RECT 88.900 2989.030 2870.740 3072.730 ;
-        RECT 88.900 2899.030 2870.740 2982.730 ;
-        RECT 88.900 2881.250 2870.740 2892.730 ;
+        RECT 74.180 2899.030 2868.900 2946.900 ;
+        RECT 74.180 2881.250 2868.900 2892.730 ;
         RECT 823.670 2874.950 2077.370 2881.250 ;
-        RECT 2803.670 2874.950 2870.740 2881.250 ;
-        RECT 88.900 2809.030 2870.740 2874.950 ;
-        RECT 88.900 2719.030 2870.740 2802.730 ;
-        RECT 88.900 2629.030 2870.740 2712.730 ;
-        RECT 88.900 2539.030 2870.740 2622.730 ;
-        RECT 88.900 2449.030 2870.740 2532.730 ;
-        RECT 88.900 2359.030 2870.740 2442.730 ;
-        RECT 88.900 2269.030 2870.740 2352.730 ;
-        RECT 88.900 2179.030 2870.740 2262.730 ;
-        RECT 88.900 2089.030 2870.740 2172.730 ;
-        RECT 88.900 1999.030 2870.740 2082.730 ;
-        RECT 88.900 1909.030 2870.740 1992.730 ;
-        RECT 88.900 1819.030 2870.740 1902.730 ;
-        RECT 88.900 1729.030 2870.740 1812.730 ;
-        RECT 88.900 1639.030 2870.740 1722.730 ;
-        RECT 88.900 1549.030 2870.740 1632.730 ;
-        RECT 88.900 1459.030 2870.740 1542.730 ;
-        RECT 88.900 1369.030 2870.740 1452.730 ;
-        RECT 88.900 1279.030 2870.740 1362.730 ;
-        RECT 88.900 1201.650 2870.740 1272.730 ;
-        RECT 88.900 1195.350 1987.370 1201.650 ;
-        RECT 88.900 1189.030 2870.740 1195.350 ;
-        RECT 88.900 1099.030 2870.740 1182.730 ;
-        RECT 88.900 1009.030 2870.740 1092.730 ;
-        RECT 88.900 919.030 2870.740 1002.730 ;
-        RECT 88.900 829.030 2870.740 912.730 ;
-        RECT 88.900 739.030 2870.740 822.730 ;
-        RECT 88.900 649.030 2870.740 732.730 ;
-        RECT 88.900 640.650 2870.740 642.730 ;
-        RECT 88.900 634.350 1987.370 640.650 ;
-        RECT 88.900 559.030 2870.740 634.350 ;
-        RECT 88.900 469.030 2870.740 552.730 ;
-        RECT 88.900 379.030 2870.740 462.730 ;
-        RECT 88.900 289.030 2870.740 372.730 ;
-        RECT 88.900 199.030 2870.740 282.730 ;
-        RECT 88.900 140.300 2870.740 192.730 ;
+        RECT 2803.670 2874.950 2868.900 2881.250 ;
+        RECT 74.180 2809.030 2868.900 2874.950 ;
+        RECT 74.180 2719.030 2868.900 2802.730 ;
+        RECT 74.180 2629.030 2868.900 2712.730 ;
+        RECT 74.180 2539.030 2868.900 2622.730 ;
+        RECT 74.180 2449.030 2868.900 2532.730 ;
+        RECT 74.180 2359.030 2868.900 2442.730 ;
+        RECT 74.180 2269.030 2868.900 2352.730 ;
+        RECT 74.180 2179.030 2868.900 2262.730 ;
+        RECT 74.180 2089.030 2868.900 2172.730 ;
+        RECT 74.180 1999.030 2868.900 2082.730 ;
+        RECT 74.180 1909.030 2868.900 1992.730 ;
+        RECT 74.180 1819.030 2868.900 1902.730 ;
+        RECT 74.180 1729.030 2868.900 1812.730 ;
+        RECT 74.180 1639.030 2868.900 1722.730 ;
+        RECT 74.180 1549.030 2868.900 1632.730 ;
+        RECT 74.180 1459.030 2868.900 1542.730 ;
+        RECT 74.180 1369.030 2868.900 1452.730 ;
+        RECT 74.180 1279.030 2868.900 1362.730 ;
+        RECT 74.180 1201.650 2868.900 1272.730 ;
+        RECT 74.180 1195.350 1987.370 1201.650 ;
+        RECT 74.180 1189.030 2868.900 1195.350 ;
+        RECT 74.180 1099.030 2868.900 1182.730 ;
+        RECT 74.180 1009.030 2868.900 1092.730 ;
+        RECT 74.180 919.030 2868.900 1002.730 ;
+        RECT 74.180 829.030 2868.900 912.730 ;
+        RECT 74.180 739.030 2868.900 822.730 ;
+        RECT 74.180 649.030 2868.900 732.730 ;
+        RECT 74.180 640.650 2868.900 642.730 ;
+        RECT 74.180 634.350 1987.370 640.650 ;
+        RECT 74.180 559.030 2868.900 634.350 ;
+        RECT 74.180 517.700 2868.900 552.730 ;
   END
 END Marmot
 END LIBRARY
diff --git a/openlane/marmot/config.tcl b/openlane/marmot/config.tcl
index 57bef1d..e415631 100644
--- a/openlane/marmot/config.tcl
+++ b/openlane/marmot/config.tcl
@@ -41,11 +41,11 @@
 #set ::env(SYNTH_NO_FLAT) 1
 set ::env(CLOCK_TREE_SYNTH) 1
 set ::env(DESIGN_IS_CORE) 1
-set ::env(FP_PDN_CORE_RING) 0
+set ::env(FP_PDN_CORE_RING) 1
 set ::env(STA_REPORT_POWER) 0
 set ::env(SYNTH_USE_PG_PINS_DEFINES) "USE_POWER_PINS"
-set ::env(VDD_NETS) {vccd1 }
-set ::env(GND_NETS) {vssd1 }
+set ::env(VDD_NETS) {vccd1}
+set ::env(GND_NETS) {vssd1}
 set ::env(VDD_PIN) "vccd1"
 set ::env(GND_PIN) "vssd1"
 set ::env(PL_TARGET_DENSITY) 0.40
diff --git a/openlane/marmot/macro.cfg b/openlane/marmot/macro.cfg
index 54b26cb..987bb97 100644
--- a/openlane/marmot/macro.cfg
+++ b/openlane/marmot/macro.cfg
@@ -1,15 +1,15 @@
 # I-Cache / ITIM RAMs
-MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram0l  100 1270 N
+MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram0l  100 1270 FS
 MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram0h  100 1830 N
-MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram1l  100 2390 N
+MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram1l  100 2390 FS
 MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram1h  100 2950 N
-MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram2l 2100 2390 N
+MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram2l 2100 2390 FS
 MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram2h 2100 2950 N
-MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram3l 2100 1270 N
+MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram3l 2100 1270 FS
 MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.data_arrays_0.data_arrays_0_0_ext.ram3h 2100 1830 N
-MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.tag_array.tag_array_0_ext.raml           910 2950 N
+MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.tag_array.tag_array_0_ext.raml           910 2950 FN
 MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.frontend.icache.tag_array.tag_array_0_ext.ramh          1490 2950 N
 # D-Cache RAMs
-MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.dcache.data.data_arrays_0.data_arrays_0_ext.ram0        2100  150 N
+MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.dcache.data.data_arrays_0.data_arrays_0_ext.ram0        2100  150 FS
 MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.dcache.data.data_arrays_0.data_arrays_0_ext.ram1        2100  710 N
 MarmotCaravelChip.dut.sys.tile_prci_domain.tile_reset_domain.tile.dcache.tag_array.tag_array_ext.ram                      1490  150 N
diff --git a/spi/lvs/Marmot.spice b/spi/lvs/Marmot.spice
index a40e0da..d448131 100644
--- a/spi/lvs/Marmot.spice
+++ b/spi/lvs/Marmot.spice
Binary files differ
diff --git a/verilog/gl/Marmot.v.gz b/verilog/gl/Marmot.v.gz
index da0af28..6717126 100644
--- a/verilog/gl/Marmot.v.gz
+++ b/verilog/gl/Marmot.v.gz
Binary files differ