diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
index b45dee9..76f499f 100644
--- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
@@ -131,32 +131,56 @@
 					   }]
 					},
 			<#else>
-				<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+				<#if carrier_apt.anticipated_receipt_list??  && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)>
 					"Unloading" :
-				<#else>
-					"Loading" :
-				</#if>
 					{
 						"Projects" : [{
-							"Commissions": [{
-								"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-								"ProjectID": "${projectRP}",
-								"PartnerAppID": "${partnerApplicationRP}",
-								"OrganisationID": "${organisationRP}"
-						}],
-							"ProjectID"	: "${projectRP}"
+							"Commissions": [
+									<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
+									{
+										"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+										<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
+											"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
+										<#else>
+											"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
+										</#if>
+										"ProjectID": "${projectRP}",
+										"PartnerAppID": "${partnerApplicationRP}",
+										"OrganisationID": "${organisationRP}"
+									}<#sep>,</#sep>
+									</#list>
+								],
+								"ProjectID"	: "${projectRP}"
 					}]
 					},
-				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
 				<#else>
-					<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
-						"Reason": "${carrier_apt.appointment_designation?json_string}",
+					<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+						"Unloading" :
 					<#else>
-						<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-							"Reason": "${carrier_apt.appointment_reference?json_string}",
+						"Loading" :
+					</#if>
+						{
+							"Projects" : [{
+								"Commissions": [{
+									"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+									"ProjectID": "${projectRP}",
+									"PartnerAppID": "${partnerApplicationRP}",
+									"OrganisationID": "${organisationRP}"
+							}],
+								"ProjectID"	: "${projectRP}"
+						}]
+						},
+					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+						"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
+					<#else>
+						<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
+							"Reason": "${carrier_apt.appointment_designation?json_string}",
 						<#else>
-							"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+							<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+								"Reason": "${carrier_apt.appointment_reference?json_string}",
+							<#else>
+								"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+							</#if>
 						</#if>
 					</#if>
 				</#if>
diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
index f834ed9..a9cdd1d 100644
--- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
@@ -114,53 +114,77 @@
 					"ProjectID"	: "${projectRP}"
 				}]
 			},
-		"Reason": "",	
+		"Reason": "",
 		<#else>
-		    <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
-			"Loading" :
-			{
-				"Projects" : [
-				{
-					"Commissions": [
-					{
-						"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-						"ProjectID": "${projectRP}",
-						"PartnerAppID": "${partnerApplicationRP}",
-						"OrganisationID": "${organisationRP}"
-					}
-					],
-					"ProjectID"	: "${projectRP}"
-				}]
-			},
-			<#else>
-				<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+			<#if carrier_apt.anticipated_receipt_list??  && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)>
 				"Unloading" :
-					{
-						"Projects" : [
-						{
-							"Commissions": [
-							{
-								"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-								"ProjectID": "${projectRP}",
-								"PartnerAppID": "${partnerApplicationRP}",
-								"OrganisationID": "${organisationRP}"
-							}
+				{
+					"Projects" : [{
+						"Commissions": [
+								<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
+								{
+									"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+									<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
+										"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
+									<#else>
+										"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
+									</#if>
+									"ProjectID": "${projectRP}",
+									"PartnerAppID": "${partnerApplicationRP}",
+									"OrganisationID": "${organisationRP}"
+								}<#sep>,</#sep>
+								</#list>
 							],
 							"ProjectID"	: "${projectRP}"
-						}]
-					},
-				</#if>
-			</#if>
-			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-				"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
+				}]
+				},
 			<#else>
-				<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
-					"Reason": "${carrier_apt.appointment_designation?json_string}",
+				<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
+				"Loading" :
+				{
+					"Projects" : [
+					{
+						"Commissions": [
+						{
+							"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+							"ProjectID": "${projectRP}",
+							"PartnerAppID": "${partnerApplicationRP}",
+							"OrganisationID": "${organisationRP}"
+						}
+						],
+						"ProjectID"	: "${projectRP}"
+					}]
+				},
 				<#else>
-					<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-						"Reason": "${carrier_apt.appointment_reference?json_string}",
+					<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
+					"Unloading" :
+						{
+							"Projects" : [
+							{
+								"Commissions": [
+								{
+									"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+									"ProjectID": "${projectRP}",
+									"PartnerAppID": "${partnerApplicationRP}",
+									"OrganisationID": "${organisationRP}"
+								}
+								],
+								"ProjectID"	: "${projectRP}"
+							}]
+						},
+					</#if>
+				</#if>
+				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+					"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
+				<#else>
+					<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
+						"Reason": "${carrier_apt.appointment_designation?json_string}",
 					<#else>
-						"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+						<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+							"Reason": "${carrier_apt.appointment_reference?json_string}",
+						<#else>
+							"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+						</#if>
 					</#if>
 				</#if>
 			</#if>
diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 7d91eec..c7f1dc9 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -39,7 +39,7 @@
 			<#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? &&
 				appointment.Unloading.Projects[0].Commissions?? &&
 				appointment.Unloading.Projects[0].Commissions[0]?? && appointment.Unloading.Projects[0].Commissions[0].OrderID?? && appointment.Unloading.Projects[0].Commissions[0].OrderID!=""
-				&& appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID=="" >
+				&& appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID == "" >
 				 "anticipated_receipt_list": [
 					<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.OrderID?? && l.OrderID !="") as commission>
 						<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>