diff --git a/TDItoRP.ftl b/TDItoRP.ftl
index 4b29808..62298c5 100644
--- a/TDItoRP.ftl
+++ b/TDItoRP.ftl
@@ -6,53 +6,60 @@
 <#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)>
 <#assign senderTag = tdiEventMsg.senderTag>
 
-{"Header":
-   {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":
-    {
-       "RefID": "${tdiEvent.HUReference1}"
-    },
-    "Payload":
-    {"Events": [
-      <#--   {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", -->
-         {"Date": {"DateTime": "${tdiEvent.EventDate}",
-                   "AuthorTimeZone": "UTC"
-                   },
-          <#if tdiEvent.EventCode?starts_with("T-") == true ||
-               tdiEvent.EventCode == "OK-COLLECTED" ||
-               tdiEvent.EventCode == "OK-IN-TRANST" ||
-               tdiEvent.EventCode == "OK-OUT-FOR-D" ||
-               tdiEvent.EventCode == "OK-WITHDRAWA" ||
-               tdiEvent.EventCode == "OK-EDI" >
-          "Code": "TRACKING_EVENT_IFTSTA_13", <#-- Acheminement conforme  -->
-          <#else>
-          <#if tdiEvent.EventCode?starts_with("D-") == true ||
-               tdiEvent.EventCode == "OK-DELIVERED"  >
-          "Code": "TRACKING_EVENT_IFTSTA_21", <#-- Livraison conforme  -->
-          <#else>
-          <#if tdiEvent.EventCode?starts_with("DC") == true ||
-               tdiEvent.EventCode?starts_with("DN") == true ||
-               tdiEvent.EventCode?starts_with("DR") == true >
-          "Code": "TRACKING_EVENT_IFTSTA_56",<#-- Livraison non aboutiee  -->
-          <#else>
-           <#if tdiEvent.EventCode?starts_with("TD") == true ||
-                tdiEvent.EventCode?starts_with("TA") == true >
-          "Code": "TRACKING_EVENT_IFTSTA_53",<#-- Acheminement non réalisé  -->
-          <#else>
-           <#if tdiEvent.EventCode == "OK-IN-TRANST" >
-          "Code": "TRACKING_EVENT_IFTSTA_5",<#-- Acheminement en cours  -->
-          <#else>
-          "Code": "TRACKING_EVENT_UNKNOWN",
-           </#if>
-           </#if>
-           </#if>
-           </#if>
-           </#if>
-          "Reason": "${tdiEvent.EventLabel}"
+<#-- Target = 0 : Expedition , Target = 1 : Colis   -->
+<#if tdiEvent.Target == 0 >
+    <#stop >
+<#else>
+	{"Header":
+	   {
+		"ProjectID": "${projectRP}"
+		},
+		"ID":
+		{
+		   "RefID": "${tdiEvent.HUReference1}"
+		},
+		"Payload":
+		{"Events": [
+		  <#--   {"Date": {"DateTime": "${tdiEvent.EventDate?datetime.iso?iso_utc}", -->
+			 {"Date": {"DateTime": "${tdiEvent.EventDate}",
+					   "AuthorTimeZone": "UTC"
+					   },
+			  <#if tdiEvent.EventCode == "OK-COLLECTED" ||
+				   tdiEvent.EventCode == "OK-EDI" ||
+				   tdiEvent.EventCode == "ADM" ||
+				   tdiEvent.EventCode == "RGP" >
+			  "Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier  -->
+			  <#else>
+			  <#if  tdiEvent.EventCode?starts_with("TA")  >
+			  "Code": "TRACKING_EVENT_IFTSTA_56", <#-- Incomplete delivery  -->
+			  <#else>
+			  <#if tdiEvent.EventCode?starts_with("T-") == true ||
+				   tdiEvent.EventCode?starts_with("TD") == true ||
+				   tdiEvent.EventCode == "OK-OUT-FOR-D" ||
+				   tdiEvent.EventCode == "OK-IN-TRANST" >
+			  "Code": "TRACKING_EVENT_IFTSTA_113",<#-- Delivery in progress  -->
+			  <#else>
+			   <#if tdiEvent.EventCode?starts_with("D-") == true ||
+					tdiEvent.EventCode == "OK-DELIVERED" ||
+				   tdiEvent.EventCode == "OK-WITHDRAWA" >
+			  "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Process Completed  -->
+			  <#else>
+			   <#if tdiEvent.EventCode?starts_with("DC") == true ||
+					tdiEvent.EventCode?starts_with("DN") == true ||
+					tdiEvent.EventCode?starts_with("DR") == true ||
+					tdiEvent.EventCode == "NEX" >
+			  "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Delivery completed  -->
+			  <#else>
+			  "Code": "TRACKING_EVENT_UNKNOWN",
+			   </#if>
+			   </#if>
+			   </#if>
+			   </#if>
+			   </#if>
+			  "Reason": "${tdiEvent.EventLabel}"
 
-          }
-          ]
-     }
-}
\ No newline at end of file
+			  }
+			  ]
+		 }
+	}
+</#if>	
\ No newline at end of file