diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index 3df7260b91..a5e6dcb7f9 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -196,10 +196,13 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_tta";
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_wait";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_tta";
+		//$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_duration";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index c2f86c46dc..2ae396a834 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -3158,6 +3158,33 @@ $text['label-unparked']['zh-cn'] = "未停车";
 $text['label-unparked']['ja-jp'] = "駐車していない";
 $text['label-unparked']['ko-kr'] = "주차되지 않음";
 
+$text['label-wait']['en-us'] = "Wait";
+$text['label-wait']['en-gb'] = "Wait";
+$text['label-wait']['ar-eg'] = "انتظر";
+$text['label-wait']['de-at'] = "Warten";
+$text['label-wait']['de-ch'] = "Warten";
+$text['label-wait']['de-de'] = "Warten";
+$text['label-wait']['el-gr'] = "Μαυρίτο";
+$text['label-wait']['es-cl'] = "Esperar";
+$text['label-wait']['es-mx'] = "Esperar";
+$text['label-wait']['fr-ca'] = "Attendre";
+$text['label-wait']['fr-fr'] = "Attendre";
+$text['label-wait']['he-il'] = "לחכות";
+$text['label-wait']['it-it'] = "Aspettare";
+$text['label-wait']['ka-ge'] = "დაელოდე";
+$text['label-wait']['nl-nl'] = "Wachten";
+$text['label-wait']['pl-pl'] = "Czekać";
+$text['label-wait']['pt-br'] = "Esperar";
+$text['label-wait']['pt-pt'] = "Esperar";
+$text['label-wait']['ro-ro'] = "Așteaptă";
+$text['label-wait']['ru-ru'] = "Ждать";
+$text['label-wait']['sv-se'] = "Vänta";
+$text['label-wait']['uk-ua'] = "Чакувати";
+$text['label-wait']['tr-tr'] = "Bekle";
+$text['label-wait']['zh-cn'] = "等待";
+$text['label-wait']['ja-jp'] = "待つ";
+$text['label-wait']['ko-kr'] = "기다리다";
+
 $text['label-waited']['en-us'] = "Waited";
 $text['label-waited']['en-gb'] = "Waited";
 $text['label-waited']['ar-eg'] = "انتظر";
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index a77dc37e79..040e947e05 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -777,6 +777,10 @@
 		echo "<th class='center shrink hide-lg-dn'>".$text['label-codecs']."</th>\n";
 		$col_count++;
 	}
+	if ($permission['xml_cdr_wait']) {
+		echo "<th class='right hide-lg-dn'>".$text['label-wait']."</th>\n";
+		$col_count++;
+	}
 	if ($permission['xml_cdr_tta']) {
 		echo "<th class='right hide-lg-dn' title=\"".$text['description-tta']."\">".$text['label-tta']."</th>\n";
 		$col_count++;
@@ -1050,13 +1054,17 @@
 					if ($permission['xml_cdr_codecs']) {
 						$content .= "	<td class='middle right hide-lg-dn no-wrap'>".($row['read_codec'] ?? '').' / '.($row['write_codec'] ?? '')."</td>\n";
 					}
+				//tta (time to answer)
+					if ($permission['xml_cdr_wait']) {
+						$content .= "	<td class='middle right hide-lg-dn'>".(!empty($row['wait']) && $row['wait'] >= 0 ? gmdate("i:s", $row['wait']) : "&nbsp;")."</td>\n";
+					}
 				//tta (time to answer)
 					if ($permission['xml_cdr_tta']) {
-						$content .= "	<td class='middle right hide-lg-dn'>".(!empty($row['tta']) && $row['tta'] >= 0 ? $row['tta']."s" : "&nbsp;")."</td>\n";
+						$content .= "	<td class='middle right hide-lg-dn'>".(!empty($row['tta']) && $row['tta'] >= 0 ? $row['tta'] : "&nbsp;")."</td>\n";
 					}
 				//pdd (post dial delay)
 					if ($permission['xml_cdr_pdd']) {
-						$content .= "	<td class='middle right hide-lg-dn'>".number_format(escape($row['pdd_ms'])/1000,2)."s</td>\n";
+						$content .= "	<td class='middle right hide-lg-dn'>".number_format(escape($row['pdd_ms'])/1000,2)."</td>\n";
 					}
 				//mos (mean opinion score)
 					if ($permission['xml_cdr_mos']) {
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index 8afa733f67..f54e0c867d 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -366,7 +366,8 @@
 	if ($permission['xml_cdr_mos']) {
 		$sql .= "c.rtp_audio_in_mos, \n";
 	}
-	$sql .= "c.waitsec as tta ";
+	$sql .= "(c.answer_epoch - c.start_epoch) as tta, ";
+	$sql .= "c.waitsec as wait ";
 	if (!empty($_REQUEST['show']) && $_REQUEST['show'] == "all" && $permission['xml_cdr_all']) {
 		$sql .= ", c.domain_name \n";
 	}