diff --git a/py-json/l3_cxprofile.py b/py-json/l3_cxprofile.py
index 196f1972..1e05bc31 100644
--- a/py-json/l3_cxprofile.py
+++ b/py-json/l3_cxprofile.py
@@ -286,8 +286,12 @@ class L3CXProfile(LFCliBase):
                     probe_results['TX MCS'] = probe_port.tx_mcs
                 probe_results['TX NSS'] = probe_port.tx_nss
                 probe_results['TX MHz'] = probe_port.tx_mhz
-                probe_results['TX Guard Interval'] = probe_port.tx_gi
+                if probe_port.tx_gi is not None:
+                    probe_results['TX GI ns'] = (probe_port.tx_gi * 10**9)
+                else:
+                    probe_results['TX GI ns'] = probe_port.tx_gi 
                 probe_results['TX Mbps Calc'] = probe_port.tx_mbit_calc
+                probe_results['TX GI'] = probe_port.tx_gi
                 probe_results['TX Mbps short GI'] = probe_port.tx_data_rate_gi_short_Mbps
                 probe_results['TX Mbps long GI'] = probe_port.tx_data_rate_gi_long_Mbps
                 probe_results['RX Bitrate'] = probe_port.rx_bitrate
@@ -299,8 +303,12 @@ class L3CXProfile(LFCliBase):
                     probe_results['RX MCS'] = probe_port.rx_mcs
                 probe_results['RX NSS'] = probe_port.rx_nss
                 probe_results['RX MHz'] = probe_port.rx_mhz
-                probe_results['RX Guard Interval'] = probe_port.rx_gi
+                if probe_port.rx_gi is not None:
+                    probe_results['RX GI ns'] = (probe_port.rx_gi * 10**9) 
+                else:
+                    probe_results['RX GI ns'] = probe_port.rx_gi
                 probe_results['RX Mbps Calc'] = probe_port.rx_mbit_calc
+                probe_results['RX GI'] = probe_port.rx_gi
                 probe_results['RX Mbps short GI'] = probe_port.rx_data_rate_gi_short_Mbps
                 probe_results['RX Mbps long GI'] = probe_port.rx_data_rate_gi_long_Mbps
 
diff --git a/py-json/port_probe.py b/py-json/port_probe.py
index baff2aea..0b046a5c 100644
--- a/py-json/port_probe.py
+++ b/py-json/port_probe.py
@@ -244,10 +244,10 @@ class ProbePort(LFCliBase):
 
         if abs(self.tx_mbit - self.tx_data_rate_gi_short_Mbps) <= abs(self.tx_mbit - self.tx_data_rate_gi_long_Mbps):
             self.tx_mbit_calc = self.tx_data_rate_gi_short_Mbps
-            self.tx_gi = T_gi_short
+            self.tx_gi = T_gi_short 
         else:
             self.tx_mbit_calc = self.tx_data_rate_gi_long_Mbps
-            self.tx_gi = T_gi_long
+            self.tx_gi = T_gi_long 
 
 
 
@@ -341,4 +341,4 @@ class ProbePort(LFCliBase):
                 self.rx_gi = T_gi_short
             else:
                 self.rx_mbit_calc = self.rx_data_rate_gi_long_Mbps
-                self.rx_gi = T_gi_long
+                self.rx_gi = T_gi_long