diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index 2d56629..dca6fc1 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -12,14 +12,14 @@
 	       <#case "APPOINTMENT_TYPE_LOADING">
 			   "unloading_appointment" : "false",
 			   "load_appointment" : "true",
-               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
-               "planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}",
+               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+               "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
 		   <#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
 		       "unloading_appointment" : "true",
 			   "load_appointment" : "false",
-			   "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
-               "planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}",
+			   "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+               "planned_unloading_end_datetime"   : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
 		   <#break>
 	       <#default>
 	         <#stop "appointment.AppointmentType not implemented" >
@@ -42,14 +42,14 @@
 					</#list>
 					],
 				<#else>
-					"appointment_designation":"${appointment.Reason?json_string}",
+					"appointment_designation":"${(appointment.Reason!"")!?json_string}",
 				</#if>
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
 					<#if appointment.Commissions.OrderID ?? && appointment.Commissions.OrderID!="">
 						"appointment_designation":"LOADING",
 					<#else>
-						"appointment_designation":"${appointment.Reason?json_string}",
+						"appointment_designation":"${(appointment.Reason!"")?json_string}",
 					</#if>
 				</#if>
 			</#if>
diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl
index 518dcc7..1903106 100644
--- a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl
@@ -14,17 +14,17 @@
 
 			   "unloading_appointment" : "false",
 			   "load_appointment" : "true",
-               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
-               "planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}"
-
+               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+               "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   
 		   <#break>
 
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
 		       "unloading_appointment" : "true",
 			   "load_appointment" : "false",
-			   "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
-               "planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}"
-		   <#break>
+               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+               "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		   <#break>
 	       <#default>
 	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>
diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl
index f4a82a1..ee02014 100644
--- a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl
@@ -13,17 +13,17 @@
 
 			   "unloading_appointment" : "false",
 			   "load_appointment" : "true",
-               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
-               "planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}"
-
+               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+               "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   
 		   <#break>
 
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
 		       "unloading_appointment" : "true",
 			   "load_appointment" : "false",
-			   "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",
-               "planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime?datetime.iso,appointment.Slot.DurationInSeconds?number)?iso_nz(time_zone_rfx)}"
-		   <#break>
+               "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+               "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		   <#break>
 	       <#default>
 	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>