diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index a64b6be1..b3c24ec3 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -3353,7 +3353,7 @@ public function getPDFormDetailsJSON_post()
 					foreach($other_assests['assets_details'] as $other_assest)
 					{
 
-						if($other_assest['emi'] == 'ýes')
+						if($other_assest['emi'] == 'yes')
 						{
 							$converted_data = $this->convertOtherAssetAsExistingLoanParams($other_assest);
 							//print_r($converted_data);
@@ -7604,7 +7604,8 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
 					 if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200)
 					 {
 					 	log_message('ERROR','###PDIMAGE stored in S3'.$pd_id.' - '.$form_id);
-					 	$record_data = array('fk_pd_id' => $pd_id,'pd_document_title'=>$title,'pd_document_name'=>$tempdocname,'fk_form_id'=>$form_id,'is_show_report' =>$is_show_report,'rental_count_id' => $rental_count_id,'location' => isset($doc['link']) ? $doc['link'] : null,'co_applicant_id' => $co_applicant_id,'img_type' => $img_type,'image_key' => (isset($doc['image_key']) ? $doc['image_key'] : null));
+					 	// $record_data = array('fk_pd_id' => $pd_id,'pd_document_title'=>$title,'pd_document_name'=>$tempdocname,'fk_form_id'=>$form_id,'is_show_report' =>$is_show_report,'rental_count_id' => $rental_count_id,'location' => isset($doc['link']) ? $doc['link'] : null,'co_applicant_id' => $co_applicant_id,'img_type' => $img_type,'image_key' => (isset($doc['image_key']) ? $doc['image_key'] : null));
+	 					$record_data = array('fk_pd_id' => $pd_id,'pd_document_title'=>$title,'pd_document_name'=>$tempdocname,'fk_form_id'=>$form_id,'is_show_report' =>$is_show_report,'rental_count_id' => $rental_count_id,'location' => isset($doc['link']) ? $doc['link'] : null,'co_applicant_id' => $co_applicant_id,'img_type' => $img_type,'image_key' => (isset($doc['image_key']) ? $doc['image_key'] : null),"pd_image_alias_name" => (isset($doc['pd_image_alias_name']) ? $doc['pd_image_alias_name'] : null));
 					 	$record_data['company_id'] = $company_id ? $company_id : null;
 					 	$id = $this->PD_Model->saveRecords($record_data,PDDOCUMENTS);
 					 	if($id != null || $id != "") { $count++; $pks[] = $id;}
diff --git a/api/application/helpers/video_grabber_helper.php b/api/application/helpers/video_grabber_helper.php
index 9850f6a3..52a20857 100644
--- a/api/application/helpers/video_grabber_helper.php
+++ b/api/application/helpers/video_grabber_helper.php
@@ -12,6 +12,7 @@ class video_grabber_helper
 	public function grabAllVideo($pdid,$random_string,$pd_master_details = array())
 	{
 		$CI =&get_instance();
+		// $CI->load->helper('url_shortener');
 
 		if(!count($pd_master_details))
 		{
@@ -25,21 +26,26 @@ class video_grabber_helper
 		if($video_info->num_rows())
 		{
 			$video_info = $video_info->result_array();
+			// $uri = url_shortener::url_shorten($pdid,$random_string);
 			//print_r($video_info);die();
 			foreach ($video_info as $key => $value) 
 			{
 				$video_name = $value['composition_id'].'.mp4';
 				if($value['is_uploaded']){$video_name = $value['composition_id'];}
 				$file_name = $video_name;
+                $date_of_creation = date('Ymd');
+                $shorten_url = custom_encryption::encode( 'vdo/'.$date_of_creation.'/'.$pdid.'/'.$value['composition_id']);
+				$shorten_url = PDF_ATTACHEMENT_URL.$shorten_url;
+				// $shorten_url = (!empty($uri['vdo']) && ($uri[$key]['video_name'] = $value['composition_id'])) ? PDF_ATTACHEMENT_URL.$uri['vdo'][$key]['url'] : "";
 				if($value['s3_copied'])
 				{
 					$final_key = 'pd'.$pd_master_details[0]['pd_id'].'/video/'.$file_name;
 					$singed_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+7 days');
-					$result_data[] = array('video_name' => $video_name,'url' => $singed_uri,'status' => $value['twilo_status'],'room_id' => $value['room_id'],'id' => $value['video_room_info_id']);
+					$result_data[] = array('video_name' => $video_name,'s3_url' => $singed_uri,'url'=>$shorten_url,'status' => $value['twilo_status'],'room_id' => $value['room_id'],'id' => $value['video_room_info_id']);
 				}
 				else 
 				{
-					$result_data[] = array('video_name' => $video_name, 'url' => '','status' =>'processing','room_id' => $value['room_id'],'id' => $value['video_room_info_id']);
+					$result_data[] = array('video_name' => $video_name, 's3_url' => '','url'=>'','status' =>'processing','room_id' => $value['room_id'],'id' => $value['video_room_info_id']);
 				}	
 
 			}