diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl
index 5151b52..a98ce7c 100644
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -16,56 +16,60 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
+      <#if preparationStatusInterface.preparation_type_code=="010" || preparationStatusInterface.preparation_type_code=="030">
          <#--**Pick batch runned (200) **-->
-      <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
-            }
-         <#else>
-            <#-- ** Collection started (300) and Preparation in progress (400)** -->
-            <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+            <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
                {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+               <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
                }
             <#else>
-                  <#-- ****Preparation dispatched (600)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
-                     {
-                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
-                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                     "datas" :
-                        <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
-                     },
-                     {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
-                     }
+               <#-- ** Collection started (300) and Preparation in progress (400)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                     <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+                  }
                <#else>
-                     <#-- ****Preparation cancelled (650)**** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                     <#-- ****Preparation dispatched (600)** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
                         {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
                         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                         "datas" :
-                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                           <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                        },
+                        {
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
+                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                           "datas" :
+                              <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
                         }
                   <#else>
-                        <#stop>
+                        <#-- ****Preparation cancelled (650)**** -->
+                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                           {
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                           "datas" :
+                              <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                           }
+                     <#else>
+                           <#stop>
+                     </#if>
                   </#if>
                </#if>
             </#if>
+         <#else>
+            <#--PRO reference is empty-->
+            <#stop >
          </#if>
       <#else>
-         <#--PRO reference is empty-->
          <#stop >
       </#if>
       ]