diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
index a9cdd1d..f203bf5 100644
--- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
@@ -90,7 +90,8 @@
 			</#if>
 		</#if>
 		"TimeZone":"${time_zone_rfx}",
-		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
+		<#if ( (carrier_apt.anticipated_receipt_list??  && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)) || (carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0))) >
+		<#assign AddComma = false />
 		"Unloading" :
 			{
 				"Projects" : [
@@ -98,6 +99,7 @@
 					"Commissions": [
 					<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
 					{
+                        <#assign AddComma = true />
 						"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 						<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
 							"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
@@ -110,81 +112,59 @@
 						"OrganisationID": "${organisationRP}"
 					}<#sep>,</#sep>
 					</#list>
+
+					<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
+					<#if AddComma == true>
+						,
+					</#if>
+					{
+						"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}"
 				}]
 			},
-		"Reason": "",
 		<#else>
-			<#if carrier_apt.anticipated_receipt_list??  && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)>
+			<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
 				"Unloading" :
-				{
-					"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}"
-				}]
-				},
 			<#else>
-				<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
 				"Loading" :
+			</#if>
+			{
+				"Projects" : [
 				{
-					"Projects" : [
+					"Commissions": [
 					{
-						"Commissions": [
-						{
-							"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-							"ProjectID": "${projectRP}",
-							"PartnerAppID": "${partnerApplicationRP}",
-							"OrganisationID": "${organisationRP}"
-						}
-						],
-						"ProjectID"	: "${projectRP}"
-					}]
-				},
+						"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>
-					<#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}",
+					<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+						"Reason": "${carrier_apt.appointment_reference?json_string}",
 					<#else>
-						<#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>
+						"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 					</#if>
 				</#if>
 			</#if>