diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
index 7786d62..941f578 100644
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -1,8 +1,8 @@
 <#include "HfRpConfig.ftl">
 [
-  <#list preparationOrder.preparation_line2_lst?filter(l ->l.despatched_ipg2_list?? && l.preparation_order_originator_reference!="") as preparation_line2>
-    <#list preparation_line2.despatched_ipg2_list as despatched_ipg2>
-    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line2.confirmation_datetime,time_zone_offset_rfx) />
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+    <#list preparation_line.despatched_ipg_list as despatched_ipg>
+    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
     {
     "Header": {
       "ProjectID": "${projectRP}"
@@ -12,19 +12,19 @@
       "AuthorTimeZone": "${time_zone_rfx}",
       "DateTime": "${packing_datetime}"
     },
-      <#if despatched_ipg2.carton_number != "000000000000000000">
-        "RefID": "${despatched_ipg2.carton_number}"
+      <#if despatched_ipg.carton_number != "000000000000000000">
+        "RefID": "${despatched_ipg.carton_number}"
       <#else>
-        "RefID": "${despatched_ipg2.hd_number}"
+        "RefID": "${despatched_ipg.hd_number}"
       </#if>
     },
 
     "Payload": {
       "Information" :{
-        <#if despatched_ipg2.carton_number != "000000000000000000">
-           "ContainerType": "${despatched_ipg2.carton_type_code?json_string}"
-           <#if preparation_line2.despatched_cartons_list?? >
-              <#list preparation_line2.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg2.carton_number) as dimensionCarton>
+        <#if despatched_ipg.carton_number != "000000000000000000">
+           "ContainerType": "${despatched_ipg.carton_type_code?json_string}"
+           <#if preparation_line.despatched_cartons_list?? >
+              <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
               ,
               "Length": {
               "Unit": "${length_unit_rfx}",
@@ -45,9 +45,9 @@
               </#list>
             </#if>
         <#else>
-           "ContainerType": "${despatched_ipg2.hd_type_code?json_string}"
-           <#if preparation_line2.despatched_hds_list??>
-            <#list preparation_line2.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg2.hd_number) as dimensionHU>
+           "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
+           <#if preparation_line.despatched_hds_list??>
+            <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
             ,
               "Length": {
                 "Unit": "${length_unit_rfx}",
@@ -72,26 +72,26 @@
     "PreparedContents" :[
        {
        "Goods": {
-           "ItemID": "${preparation_line2.item_code?trim?json_string}",
-           "LVBranchID": "${preparation_line2.item_lv_code?json_string}",
-           <#if (despatched_ipg2.ipg_manufacture_date?length != 0) && (despatched_ipg2.ipg_manufacture_date?starts_with("00") == false)>
-              <#assign priority_date = despatched_ipg2.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+           "ItemID": "${preparation_line.item_code?trim?json_string}",
+           "LVBranchID": "${preparation_line.item_lv_code?json_string}",
+           <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+              <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
               "PriorityDate": "${priority_date}",
                 <#else>
-                  <#if (despatched_ipg2.ipg_receipt_date?length != 0) && (despatched_ipg2.ipg_receipt_date?starts_with("00")== false)>
-                    <#assign priority_date = despatched_ipg2.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
+                  <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+                    <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
                     "PriorityDate": "${priority_date}",
                       <#else>
-                        <#if (despatched_ipg2.ipg_best_before_date?length != 0) && (despatched_ipg2.ipg_best_before_date?starts_with("00")== false)>
-                          <#assign priority_date = despatched_ipg2.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+                        <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+                          <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
                           "PriorityDate": "${priority_date}",
                             <#else>
-                              <#if (despatched_ipg2.ipg_sell_by_date?length != 0) && (despatched_ipg2.ipg_sell_by_date?starts_with("00")== false)>
-                                <#assign priority_date = despatched_ipg2.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+                              <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+                                <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
                                 "PriorityDate": "${priority_date}",
                                   <#else>
-                                    <#if (despatched_ipg2.ipg_use_by_date?length != 0) && (despatched_ipg2.ipg_use_by_date?starts_with("00")== false)>
-                                      <#assign priority_date = despatched_ipg2.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+                                    <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+                                      <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
                                       "PriorityDate": "${priority_date}",
                                         <#else>
                                           <#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
@@ -109,16 +109,16 @@
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
          },
-       "ExecutionflowID": "${preparation_line2.preparation_order_originator_reference?trim?json_string}",
-        <#if (preparation_line2.pro_originator_reference_line_number!0) != 0>
-          "LineID": "${preparation_line2.pro_originator_reference_line_number}",
+       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
+          "LineID": "${preparation_line.pro_originator_reference_line_number}",
         <#else>
-          "LineID": "${preparation_line2.pro_line_number!0}",
+          "LineID": "${preparation_line.pro_line_number!0}",
         </#if>
        "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
        "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",
-            "Value": ${despatched_ipg2.quantity_lvs}
+            "Value": ${despatched_ipg.quantity_lvs}
        }
 
       }