diff --git a/compiler/base/hierarchy_layout.py b/compiler/base/hierarchy_layout.py
index 7ca86af9..465a661e 100644
--- a/compiler/base/hierarchy_layout.py
+++ b/compiler/base/hierarchy_layout.py
@@ -558,7 +558,6 @@ class layout(lef.lef):
         height = (ur.y-ll.y) + 3 * self.supply_rail_pitch - supply_rail_spacing
         width = (ur.x-ll.x) + 3 * self.supply_rail_pitch - supply_rail_spacing
 
-        
         # LEFT vertical rails
         offset = ll + vector(-2*self.supply_rail_pitch, -2*self.supply_rail_pitch)
         left_gnd_pin=self.add_layout_pin(text="gnd",
@@ -631,6 +630,17 @@ class layout(lef.lef):
         self.top_gnd_y_center = top_gnd_pin.cy()
         self.top_vdd_y_center = top_vdd_pin.cy()
 
+
+        # Find the number of vias for this pitch
+        self.supply_vias = 1
+        import contact
+        while True:
+            c=contact.contact(("metal1","via1","metal2"), (self.supply_vias, self.supply_vias))
+            if c.second_layer_width < self.supply_rail_width and c.second_layer_height < self.supply_rail_width:
+                self.supply_vias += 1
+            else:
+                break
+        
         via_points = [vector(self.left_gnd_x_center, self.bottom_gnd_y_center),
                       vector(self.left_gnd_x_center, self.top_gnd_y_center),
                       vector(self.right_gnd_x_center, self.bottom_gnd_y_center),
@@ -643,7 +653,7 @@ class layout(lef.lef):
         for pt in via_points:
             self.add_via_center(layers=("metal1", "via1", "metal2"),
                                 offset=pt,
-                                size = (3,3))
+                                size = (self.supply_vias, self.supply_vias))
 
 
         
diff --git a/compiler/modules/bank.py b/compiler/modules/bank.py
index efbcfafc..7c991b9b 100644
--- a/compiler/modules/bank.py
+++ b/compiler/modules/bank.py
@@ -147,7 +147,7 @@ class bank(design.design):
 
         # Width for the vdd/gnd rails
         self.supply_rail_width = 4*self.m2_width
-        self.supply_rail_pitch = self.supply_rail_width + 1.5*self.m2_space
+        self.supply_rail_pitch = self.supply_rail_width + 2*self.m2_space
         
         # Number of control lines in the bus
         self.num_control_lines = 6
@@ -367,7 +367,7 @@ class bank(design.design):
 
         temp = []
         for i in range(self.row_addr_size):
-            temp.append("A[{0}]".format(i))
+            temp.append("A[{0}]".format(i+self.col_addr_size))
         for j in range(self.num_rows):
             temp.append("dec_out[{0}]".format(j))
         temp.extend(["vdd", "gnd"])
@@ -406,7 +406,7 @@ class bank(design.design):
 
         temp = []
         for i in range(self.col_addr_size):
-            temp.append("A[{0}]".format(i + self.row_addr_size))
+            temp.append("A[{0}]".format(i))
         for j in range(self.num_col_addr_lines):
             temp.append("sel[{0}]".format(j))
         temp.extend(["vdd", "gnd"])
@@ -637,7 +637,7 @@ class bank(design.design):
             self.add_path("metal1", [left_rail_position, gnd_position])   
             self.add_via_center(layers=("metal1", "via1", "metal2"),
                                 offset=left_rail_position,
-                                size = (1,3),
+                                size = (1,self.supply_vias),
                                 rotate=90)
                         
         # route the vdd rails
@@ -650,7 +650,7 @@ class bank(design.design):
             self.add_path("metal1", [left_rail_position, right_rail_position])
             self.add_via_center(layers=("metal1", "via1", "metal2"),
                                 offset=left_rail_position,
-                                size = (1,3),
+                                size = (1,self.supply_vias),
                                 rotate=90)
 
     
@@ -726,7 +726,7 @@ class bank(design.design):
             self.add_path("metal1", [left_rail_pos, gnd_pin.rc()])
             self.add_via_center(layers=("metal1", "via1", "metal2"),
                                 offset=left_rail_pos,
-                                size = (1,3),
+                                size = (1,self.supply_vias),
                                 rotate=90)
 
         # route the vdd rails
@@ -735,7 +735,7 @@ class bank(design.design):
             self.add_path("metal1", [left_rail_pos, vdd_pin.rc()])
             self.add_via_center(layers=("metal1", "via1", "metal2"),
                                 offset=left_rail_pos,
-                                size = (1,3),
+                                size = (1,self.supply_vias),
                                 rotate=90)
                                 
             
@@ -835,7 +835,7 @@ class bank(design.design):
                 via_position = vector(self.right_vdd_x_center, vdd_pin.cy())
                 self.add_via_center(layers=("metal1", "via1", "metal2"),
                                     offset=via_position,
-                                    size = (1,3),
+                                    size = (1,self.supply_vias),
                                     rotate=90)
                         
         # Route the vdd rails to the LEFT
@@ -846,11 +846,11 @@ class bank(design.design):
             self.add_path("metal1", [left_rail_pos, right_rail_pos])
             self.add_via_center(layers=("metal1", "via1", "metal2"),
                                 offset=left_rail_pos,
-                                size = (1,3),
+                                size = (1,self.supply_vias),
                                 rotate=90)
             self.add_via_center(layers=("metal1", "via1", "metal2"),
                                 offset=right_rail_pos,
-                                size = (1,3),
+                                size = (1,self.supply_vias),
                                 rotate=90)
 
         if self.num_banks>1:
@@ -860,7 +860,7 @@ class bank(design.design):
                 self.add_path("metal1", [left_rail_pos, vdd_pos])
                 self.add_via_center(layers=("metal1", "via1", "metal2"),
                                     offset=left_rail_pos,
-                                    size = (1,3),
+                                    size = (1,self.supply_vias),
                                     rotate=90)
             
 
@@ -880,7 +880,7 @@ class bank(design.design):
                 via_position = vector(self.right_gnd_x_center, gnd_pin.cy())
                 self.add_via_center(layers=("metal1", "via1", "metal2"),
                                     offset=via_position,
-                                    size = (1,3),
+                                    size = (1,self.supply_vias),
                                     rotate=90)
 
         # Route the gnd rails to the LEFT
@@ -894,7 +894,7 @@ class bank(design.design):
                 self.add_path("metal1", [left_rail_pos, gnd_pos])
                 self.add_via_center(layers=("metal1", "via1", "metal2"),
                                     offset=left_rail_pos,
-                                    size = (1,3),
+                                    size = (1,self.supply_vias),
                                     rotate=90)
 
     def add_control_pins(self):