diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
new file mode 100644
index 0000000..e69de29
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index 99c913c..bf15429 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -30,7 +30,24 @@
         },
        "ShipFromAcked": true,    
          "ShipTo": {
-          <#if preparation_order.address.type_code == "" && preparation_order.address.title_code == "" && preparation_order.address.first_name == "" && preparation_order.address.last_name == "" && preparation_order.address.mail_address == "" && preparation_order.address.contact_type_code == "" && preparation_order.address.mobile_phone_number == "" && preparation_order.address.land_line_phone_number == "" && preparation_order.address.fax_number == "" && preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" && preparation_order.address.additional_address_data_1 == "" && preparation_order.address.additional_address_data_2 == "" && preparation_order.address.post_code_area_name == "" && preparation_order.address.territorial_division_code == "" && preparation_order.address.postal_code == "" && preparation_order.address.iso_country_code == ""> 
+          <#if 
+          <#-- preparation_order.address.type_code == "" && 
+          preparation_order.address.title_code == "" && 
+          preparation_order.address.first_name == "" && 
+          preparation_order.address.last_name == "" && 
+          preparation_order.address.mail_address == "" && 
+          preparation_order.address.contact_type_code == "" && 
+          preparation_order.address.mobile_phone_number == "" && 
+          preparation_order.address.land_line_phone_number == "" && 
+          preparation_order.address.fax_number == "" && -->
+          preparation_order.address.address_type_code == "" && 
+          preparation_order.address.name_or_company_name == "" && 
+          preparation_order.address.additional_address_data_1 == "" && 
+          preparation_order.address.additional_address_data_2 == "" && 
+          preparation_order.address.post_code_area_name == "" && 
+          preparation_order.address.territorial_division_code == "" && 
+          preparation_order.address.postal_code == "" && 
+          preparation_order.address.iso_country_code == ""> 
             "ActorID": "${preparation_order.end_consignee_code}"
           <#else>        
             "Actor":