diff --git a/compiler/characterizer/lib.py b/compiler/characterizer/lib.py
index 1e68fc2e..b0668ddc 100644
--- a/compiler/characterizer/lib.py
+++ b/compiler/characterizer/lib.py
@@ -181,17 +181,20 @@ class lib:
         self.lib.write("    dont_touch : true;\n")
         self.lib.write("    area : {};\n\n".format(self.sram.width * self.sram.height))
 
-        #Build string of all control signals. 
+        self.write_pg_pin()
+
+        #Build string of all control signals.
         control_str = 'csb0' #assume at least 1 port
         for i in range(1, self.total_port_num):
             control_str += ' & csb{0}'.format(i)
             
         # Leakage is included in dynamic when macro is enabled
         self.lib.write("    leakage_power () {\n")
-        self.lib.write("      when : \"{0}\";\n".format(control_str))
+        # 'when' condition unnecessary when cs pin does not turn power to devices
+        # self.lib.write("      when : \"{0}\";\n".format(control_str))
         self.lib.write("      value : {};\n".format(self.char_sram_results["leakage_power"]))
         self.lib.write("    }\n")
-        self.lib.write("    cell_leakage_power : {};\n".format(0))
+        self.lib.write("    cell_leakage_power : {};\n".format(self.char_sram_results["leakage_power"]))
         
     
     def write_units(self):
@@ -240,6 +243,9 @@ class lib:
         self.lib.write("    default_max_fanout   : 4.0 ;\n")
         self.lib.write("    default_connection_class : universal ;\n\n")
 
+        self.lib.write("    voltage_map ( vdd, {} );\n".format(tech.spice["nom_supply_voltage"]))
+        self.lib.write("    voltage_map ( gnd, 0 );\n\n")
+
     def create_list(self,values):
         """ Helper function to create quoted, line wrapped list """
         list_values = ", ".join(str(v) for v in values)
@@ -518,7 +524,7 @@ class lib:
                 web_name = " & !web{0}".format(port)
             avg_write_power = np.mean(self.char_port_results[port]["write1_power"] + self.char_port_results[port]["write0_power"])
             self.lib.write("        internal_power(){\n")
-            self.lib.write("            when : \"!csb{0} & clk{0}{1}\"; \n".format(port, web_name))
+            self.lib.write("            when : \"!csb{0}{1}\"; \n".format(port, web_name))
             self.lib.write("            rise_power(scalar){\n")
             self.lib.write("                values(\"{0}\");\n".format(avg_write_power/2.0))
             self.lib.write("            }\n")
@@ -532,7 +538,7 @@ class lib:
                 web_name = " & web{0}".format(port)
             avg_read_power = np.mean(self.char_port_results[port]["read1_power"] + self.char_port_results[port]["read0_power"])
             self.lib.write("        internal_power(){\n")
-            self.lib.write("            when : \"!csb{0} & !clk{0}{1}\"; \n".format(port, web_name))
+            self.lib.write("            when : \"!csb{0}{1}\"; \n".format(port, web_name))
             self.lib.write("            rise_power(scalar){\n")
             self.lib.write("                values(\"{0}\");\n".format(avg_read_power/2.0))
             self.lib.write("            }\n")
@@ -552,6 +558,16 @@ class lib:
         self.lib.write("            }\n")
         self.lib.write("        }\n")
         
+    def write_pg_pin(self):
+        self.lib.write("    pg_pin(vdd) {\n")
+        self.lib.write("         voltage_name : VDD;\n")
+        self.lib.write("         pg_type : primary_power;\n")
+        self.lib.write("    }\n\n")
+        self.lib.write("    pg_pin(gnd) {\n")
+        self.lib.write("         voltage_name : GND;\n")
+        self.lib.write("         pg_type : primary_ground;\n")
+        self.lib.write("    }\n\n")
+
     def compute_delay(self):
         """Compute SRAM delays for current corner"""
         self.d = delay(self.sram, self.sp_file, self.corner)