diff --git a/contract_manage.php b/contract_manage.php
index 7c68f30..c84ca5c 100644
--- a/contract_manage.php
+++ b/contract_manage.php
@@ -153,6 +153,7 @@ $view .='<div class="content-block tab-content active">
              <div class="form responsive-width-100">
                 <label for="">'.$contract_billinglabel.'</label>
                 <select name="billing_plan">
+                    <option value="4" '.($contract['billing_plan']==4?' selected':'').'>'.($contract_billing4 ?? 'Onetime Upfront').'</option>
                     <option value="0" '.($contract['billing_plan']==0?' selected':'').'>'.$contract_billing0.'</option>
                     <option value="1" '.($contract['billing_plan']==1?' selected':'').'>'.$contract_billing1.'</option>
                     <option value="2" '.($contract['billing_plan']==2?' selected':'').'>'.$contract_billing2.'</option>
diff --git a/products_software.php b/products_software.php
index a3a74c1..0c69d6a 100644
--- a/products_software.php
+++ b/products_software.php
@@ -57,10 +57,16 @@ if (isset($_GET['rowID'])) {
                     $contents = file_get_contents($_FILES["fileToUpload"]["tmp_name"]);
                     //firmwarename
                     $firmware_name = pathinfo($_FILES["fileToUpload"]["name"], PATHINFO_FILENAME);
+                    $commitCode = compareCommitCodes($firmware_name,"");
+
+                    //IF COMMITCODE IS EMPTY THEN RETURN HEX_FW
+                    $fw_name = ($commitCode != '' || !empty($commitCode)) ? $commitCode : $firmware_name;
+                    
                     //Filename
                     $input_file = $target_dir . $firmware_name.'.HEX';
                     //store firmware file
                     file_put_contents($input_file, $contents);
+                    $_POST['version'] = $fw_name;
 
                 } else {
                     $target_file = $target_dir . $firmware_file;
@@ -123,11 +129,17 @@ if (isset($_GET['rowID'])) {
                 $contents = file_get_contents($_FILES["fileToUpload"]["tmp_name"]);
                 //firmwarename
                 $firmware_name = pathinfo($_FILES["fileToUpload"]["name"], PATHINFO_FILENAME);
+                $commitCode = compareCommitCodes($firmware_name,"");
+
+                //IF COMMITCODE IS EMPTY THEN RETURN HEX_FW
+                $fw_name = ($commitCode != '' || !empty($commitCode)) ? $commitCode : $firmware_name;
                 //Filename
                 $input_file = $target_dir . $firmware_name.'.HEX';
                 //store firmware file
                 file_put_contents($input_file, $contents);
                 
+                $_POST['version'] = $fw_name;
+
                 $firmware_name = $firmware_name.'.HEX';
 
             } else {
diff --git a/report_contracts_billing.php b/report_contracts_billing.php
index 5d57273..729b655 100644
--- a/report_contracts_billing.php
+++ b/report_contracts_billing.php
@@ -85,6 +85,7 @@ $view .= '
                      <label for="">'.$contract_billinglabel.'</label>
                     <select name="billing_plan">
                         <option value=""></option>
+                        <option value="4" '.($contract['billing_plan']==4?' selected':'').'>'.$contract_billing4.'</option>
                         <option value="0" '.($contract['billing_plan']==0?' selected':'').'>'.$contract_billing0.'</option>
                         <option value="1" '.($contract['billing_plan']==1?' selected':'').'>'.$contract_billing1.'</option>
                         <option value="2" '.($contract['billing_plan']==2?' selected':'').'>'.$contract_billing2.'</option>