diff --git a/derived_variables_generator.py b/derived_variables_generator.py
index 02ae5235dd5f6d3b42607ac0cf48658d201379df..466da495c142e852becf4d984c5e8ffe525394fa 100644
--- a/derived_variables_generator.py
+++ b/derived_variables_generator.py
@@ -40,10 +40,10 @@ if "DMRAGEYR" in datafile.columns:
         
     
 
-if "DSXOS" in datafile.columns:
+if "DATDS" in datafile.columns:
     
     derived_outcome_month = []
-    for x in datafile["DSXOS"]:
+    for x in datafile["DATDS"]:
         month_num = x.split("/")[1]
         
         datetime_object = datetime.datetime.strptime(month_num, "%m")
@@ -51,9 +51,24 @@ if "DSXOS" in datafile.columns:
 
         derived_outcome_month.append(full_month_name)
     
-    datafile["MONTH_DISCHARGE"] = derived_outcome_month
+    datafile["DISCHARGE_DATE"] = derived_outcome_month
 
 
+
+if "DATAD" in datafile.columns:
+    
+    derived_outcome_month = []
+    for x in datafile["DATAD"]:
+        month_num = x.split("/")[1]
+        
+        datetime_object = datetime.datetime.strptime(month_num, "%m")
+        full_month_name = datetime_object.strftime("%B")
+
+        derived_outcome_month.append(full_month_name)
+    
+    datafile["ADMISSION_DATE"] = derived_outcome_month
+
+    
     
 new_datafile_path = datafile_path.replace(".csv", "_derived.csv")
 datafile.to_csv(new_datafile_path, index = False)
\ No newline at end of file
diff --git a/numeric_converter.py b/numeric_converter.py
index 613ef70b94df3904cd18215402152a60363b631a..0d6fd56b35a868fa6062d70f9dc8377e3b9800c3 100644
--- a/numeric_converter.py
+++ b/numeric_converter.py
@@ -19,6 +19,8 @@ categorical_variables = ["DMRGENDR", "DMRBORN", "DMRRETH1", "DMROCCU", "DMRHREDU
                          "HMRACI","HMRARB","HMRAHO","HMRNS","HMROS","HMRCS","HMRIS","HMRAV","HMRAB","HMRCOV","IMDXCT","IMDXCTCR","IMDXCTTE","IMDXCTAB","IMDXXR","IMDXPN",
                          "COXRD","COXAR","COXPM","COXMOD","COXPT","COXEC","COXSH","COXIO","COXPE","COXST","COXDIC","COXRIO","COXKF","COXHF","COXBC"]
 
+numeric_variables = ["DMRAGEYR","DMXHT","DMXWT","DMXBMI","DATLGT","DATLGTI","DATSSDHn","CSXBTPA","CSXBTPHn","CSXOSTA","CSXOSTHn","CSXCHRA","CSXCHRHn","CSXRRA","CSXRRHn","CSXRRI","CSXSYA","CSXSYHn","CSXDIA","CSXDIHn","SMTFE","SMTCO","SMTST","SMTSB","SMXSEA","DATIMD","IMDXCTLD","IMDXEQ","DATLBDHn","LBXHGBA","LBXHGBHn","LBXESRA","LBXESRHn","LBXWBCSIA","LBXWBCSIHn","LBXLYMNOA","LBXLYMNOHn","LBXNENOA","LBXNENOHn","LBXHCTA","LBXHCTHn","LBXPLTSIA","LBXPLTSIHn","LBXGHA","LBXGHHn","LBXAPTTA","LBXAPTTHn","LBXAPTRA","LBXAPTRHn","LBXPTA","LBXPRHn","LBXINRA","LBXINRHn","LBXSATSIA","LBXSATSIHn","LBXSTBA","LBXSTBHn","LBXSCBA","LBXSCBHn","LBXSUBA","LBXSUBHn","LBXSASSIA","LBXSASSIHn","LBXSGLA","LBXSGLHn","LBXSBUA","LBXSBUHn","LBXSBLA","LBXSBLHn","LBXSCRA","LBXSCRHn","LBXSNASIA","LBXSNASIHn","LBXSCLSIA","LBXSCLSIHn","LBXSKSIA","LBXSKSIHn","LBXSPCA","LBXSPCHn","LBXCRPA","LBXCRPHn","LBXSLDSIA","LBXSLDSIHn","LBXCTRA","LBXCTRHn","LBXCDDA","LBXCDDHn","LBXFERSIA","LBXFERSIHn","LBXIL6A","LBXIL6Hn","LBDFBSIA","LBDFBSIHn","LBDSALSIA","LBDSALSIHn","LBXSAPSIA","LBXSAPSIHn","LBXSGTSIA","LBXSGTSIHn","LBXCFDA","LBXCFDHn","LBXFIOA","LBXFIOHn","LBXPOA","LBXPOHn","LBXPCOA","LBXPCOHn","LBXSC3SIA","LBXSC3SIHn","LBXPHA","LBXPHHn","LBXBEH","LBXBEHn","LBXA4A","LBXA4Hn","LBXTCA","LBXTCHn","LBXTRA","LBXTRHn","LBXSCKA","LBXSCKHn","LBXPSCKA","LBXPSCKHn"]
+
 datafile = pd.read_csv(datafile_path, csv_separator)
 
 
@@ -28,11 +30,18 @@ for col in convert_col:
     
     unique_values = datafile[col].unique()
     
-    numeric_column_dict = {x: i for i, x in enumerate(unique_values)}
+    numeric_column_dict = {str(x): i for i, x in enumerate(unique_values)}
     
-    numeric_column = [numeric_column_dict[x] for x in datafile[col]]
+    numeric_column = [numeric_column_dict[str(x)] for x in datafile[col]]
     
     datafile[col + "_numeric"] = numeric_column
 
+
+verify_num_col = [x for x in datafile.columns if x in numeric_variables]
+
+for col in verify_num_col:
+    
+    datafile[col] = [float(x) for x in datafile[col]]
+
 new_datafile_path = datafile_path.replace(".csv", "_numeric.csv")
 datafile.to_csv(new_datafile_path, index = False)
\ No newline at end of file