diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index f448a230..09eb76fc 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -2566,8 +2566,28 @@ class PD_Controller extends REST_Controller {
 		$pdid = $records['pd_id'];
 		$version_id = $records['version_id'];
 		
+		$version_no = "";
+		
+		if(is_numeric(substr($version_id,-7,3)))
+		{
+			$version_no = substr($version_id,-7,3);
+			
+		}
+		else if(is_numeric(substr($version_id,-6,2)))
+		{
+			$version_no = substr($version_id,-6,2);
+			
+		}else if(is_numeric(substr($version_id,-5,1)))
+		{
+			$version_no = substr($version_id,-5,1);
+		}
+		else
+		{
+			$version_no = 1;
+		}
+		
 		$fields = array('content');
-		$where_condition_array = array('fk_pd_id'=>$pdid,'version_no'=>$version_id);
+		$where_condition_array = array('fk_pd_id'=>$pdid,'version_no'=>$version_no);
 		$result_array = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDREPORTSVERSIONBLOB);
 		if(count($result_array))
 		{
@@ -2593,9 +2613,10 @@ class PD_Controller extends REST_Controller {
 	{
 		$records = $this->post('records');
 		$pdid = $records['pd_id'];
+		$fk_createdby = $records['fk_createdby'];
 		$original_template = "RAW";
 		$is_regenerate = 0;
-		if($records['regen'])
+		if($records['regenerate'])
 		{
 			$is_regenerate = 1;	
 		}
@@ -2658,7 +2679,7 @@ class PD_Controller extends REST_Controller {
 					else
 					{
 						$latest_version = $pd_master_details[0]['pd_report_latest_version'] + 1;
-						$key = 'pd'.$pdid.'/pd_reports/'.$latest_version.'.pdf';
+						$key = 'pd'.$pdid.'/pd_reports/version'.$latest_version.'.pdf';
 					}
 					$sourcefile = $output_file2;
 					
@@ -2670,8 +2691,19 @@ class PD_Controller extends REST_Controller {
 						
 						$where_condition_array = array("pd_id" => $pdid);
 						$temp_array = array('is_original_report_created'=>1,'pd_report_latest_version_blob'=>$result_array[0]['content']);
+						
+						if($is_regenerate != 0)
+						{
+							$temp_array = array('is_original_report_created'=>1,'pd_report_latest_version_blob'=>$result_array[0]['content'],'pd_report_latest_version'=>$latest_version);
+							
+							
+						}
 						$id = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array);
 						
+						$blob_table_temp_array = array('version_no' => $latest_version,'content' => $result_array[0]['content'],'fk_pd_id' => $pdid,'fk_createdby' => $fk_createdby);
+						
+						$id = $this->PD_Model->saveRecords($blob_table_temp_array,PDREPORTSVERSIONBLOB);
+						
 						
 						
 						//call all reports functionality and send it.
@@ -2697,7 +2729,7 @@ class PD_Controller extends REST_Controller {
 		 }
 		
 					
-	}
+	
 	
 	
 	/*********************************************************************************************
@@ -2726,7 +2758,7 @@ class PD_Controller extends REST_Controller {
 		//$latest_version = $pd_master_details[0]['pd_report_latest_version'] + 1;
 		//$where_condition_array = array('pd_id' => $pdid);
 		$temp_array_one = array('content' => $blob,'fk_updatedby'=>$fk_updatedby);
-		$where_condition_array = array('fk_pd_id' => ,'version_no' => $latest_version);
+		$where_condition_array = array('fk_pd_id' => $pdid,'version_no' => $latest_version);
 		$id = $this->PD_Model->updateRecords($temp_array_one,PDREPORTSVERSIONBLOB,$where_condition_array);
 		
 		//convert BLOB as html then pdf then store it s3.
@@ -2908,8 +2940,26 @@ class PD_Controller extends REST_Controller {
 		$pdid = $records['pd_id'];
 		$doc_name = $records['doc_name'];
 		$fk_createdby  = $records['fk_createdby'];
-		//pd_report_version_blob_id, version_no, content, is_latest, createdon, updateon, fk_createdby, fk_updatedby, fk_pd_id
-		$version_no = substr($doc_name,-5,1);
+		
+		$version_no = "";
+		
+		if(is_numeric(substr($doc_name,-7,3)))
+		{
+			$version_no = substr($doc_name,-7,3);
+			
+		}
+		else if(is_numeric(substr($doc_name,-6,2)))
+		{
+			$version_no = substr($doc_name,-6,2);
+			
+		}else if(is_numeric(substr($doc_name,-5,1)))
+		{
+			$version_no = substr($doc_name,-5,1);
+		}
+		else
+		{
+			$version_no = 1;
+		}
 		
 			//Get Latest Version from PD Master Table
 			$pd_master_details = $this->PD_Model->getPDMasterDetails($pdid);