diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl
index 63f96df..2a1aa97 100644
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -16,7 +16,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> 
       [
-         <#--**Pick batch runned (100) **-->
+         <#--**Pick batch runned (200) **-->
          <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> 
diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index f365bc0..2d5075d 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -2,57 +2,59 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-
+ 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
-
+ 
 <#assign aDateTime = .now>
-
+ 
 <#switch cloudEventMsg.action>
-    <#case "C">
-    <#--<#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> 
-       [  
+<#case "C">
+<#--<#case "U">
+<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> 
+       
+<#if	preparationOrder.total_lv_validated !=0>   
+	   [  
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> 
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :         
           <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
          },
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :         
           <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">          
          }
-        
           <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
-            <#list preparation_line.despatched_ipg_list as despatched_ipg>
-              <#if despatched_ipg.consignment_unit_id != ""> 
-                ,
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :         
-                <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
-                }
-              </#if>
-
+          <#list preparation_line.despatched_ipg_list as despatched_ipg>
+          <#if despatched_ipg.consignment_unit_id != ""> 
+            ,
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :         
+            <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
+            }
+          </#if>
+ 
             </#list>
           </#list>
-       ]         
-      <#break>
-      
-      <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported (Case D)">
-      <#break>
-          
-      
-    <#default>
-          <#stop "event not supported">
-</#switch>
+       ]
+<#else>
+    <#stop "no confirmed quantity for the preparation - preparation closed">
+</#if>
+   
+<#break>
+<#case "D">
+<#-- *********************************************** Action = DELETE ******************** -->
+<#stop "event not supported (Case D)">
+<#break>
 
+<#default>
+<#stop "event not supported">
+</#switch>
\ No newline at end of file