diff --git a/src/BreCalClient/BreCalLists.cs b/src/BreCalClient/BreCalLists.cs
index 3857e90..81b0369 100644
--- a/src/BreCalClient/BreCalLists.cs
+++ b/src/BreCalClient/BreCalLists.cs
@@ -30,6 +30,13 @@ namespace BreCalClient
         private readonly static ConcurrentDictionary<int, Berth> _berthLookupDict = new();
         private readonly static Dictionary<int, Participant> _participantLookupDict = new();
 
+        private readonly static List<string> _timeRefs = new List<string>
+        {
+            "Liegeplatz",
+            "Geeste",
+            "TN-Weser"
+        };
+
         #endregion
 
         #region Properties
@@ -90,6 +97,11 @@ namespace BreCalClient
         /// </summary>
         public static List<ShipModel> AllShips { get { return _allShips; } }
 
+        /// <summary>
+        /// List of display values for TimeRef points
+        /// </summary>
+        public static List<string> TimeRefs { get { return _timeRefs; } }
+
         #endregion
 
         #region methods
diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 4e098cd..101eeac 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -8,7 +8,7 @@
         xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="242" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditShipcall}" Height="270" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Window.Resources>
         <local:BoolToIndexConverter x:Key="boolToIndexConverter" />
     </Window.Resources>
@@ -27,6 +27,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
 
         <Label Content="{x:Static p:Resources.textShip}" Grid.Column="0" Grid.Row="0"  HorizontalContentAlignment="Right"/>
@@ -44,9 +45,7 @@
         <Button x:Name="buttonEditShips" Grid.Column="1" Grid.Row="6" Margin="2" Content="{x:Static p:Resources.textEditShips}" Click="buttonEditShips_Click" Visibility="Hidden" />
 
         <Label Content="{x:Static p:Resources.textType}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" />
-        <Label Content="ETA" Grid.Column="2" Grid.Row="2"  HorizontalContentAlignment="Right"/>
-        <Label Content="ETD" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right"/>
-
+        
         <ComboBox x:Name="comboBoxCategories" Grid.Column="3" Margin="2" Grid.Row="0" SelectionChanged="comboBoxCategories_SelectionChanged"/>
 
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="2" Grid.Row="1"  HorizontalContentAlignment="Right"/>
@@ -61,12 +60,18 @@
 
 
         </Grid>
-        
-        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="3" Grid.Row="2" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
-        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
 
-        <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
-        <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
+        <Label Content="Zeit Ref." Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right" />
+
+        <Label Content="ETA" Grid.Column="2" Grid.Row="3"  HorizontalContentAlignment="Right" Margin="0,2,0,26" Grid.RowSpan="2"/>
+        <Label Content="ETD" Grid.Column="2" Grid.Row="4"  HorizontalContentAlignment="Right"/>
+        
+        <ComboBox x:Name="comboBoxTimeRef" Grid.Column="3" Margin="2" Grid.Row="2" />
+        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="3" Grid.Row="3" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETA_ValueChanged"/>
+        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="3" Grid.Row="4" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" IsEnabled="False" ValueChanged="datePickerETD_ValueChanged"/>
+
+        <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="5"  HorizontalContentAlignment="Right"/>
+        <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id" SelectionChanged="comboBoxAgency_SelectionChanged">
             <ComboBox.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearAgency" Click="contextMenuItemClearAgency_Click" />
@@ -74,8 +79,8 @@
             </ComboBox.ContextMenu>
         </ComboBox>
 
-        <Label x:Name="labelBSMDGranted" Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="1" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
-        <StackPanel Grid.Row="6" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+        <Label x:Name="labelBSMDGranted" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="1" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
+        <StackPanel Grid.Row="7" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 7d60717..45abafa 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -53,6 +53,8 @@ namespace BreCalClient
             this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
             this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
 
+            this.comboBoxTimeRef.ItemsSource = BreCalLists.TimeRefs;
+
             if (this.ShipcallModel.Shipcall == null) this.ShipcallModel.Shipcall = new();
             this.CopyToControls();
 
@@ -80,14 +82,14 @@ namespace BreCalClient
                 this.integerUpDownIMO.Value = ship?.Ship.Imo;
                 this.textBoxCallsign.Text = ship?.Ship.Callsign;
                 this.doubleUpDownLength.Value = ship?.Ship.Length;
-                this.doubleUpDownWidth.Value = ship?.Ship.Width;
+                this.doubleUpDownWidth.Value = ship?.Ship.Width;                
             }
             else
             {
                 this.integerUpDownIMO.Value = null;
                 this.textBoxCallsign.Text = string.Empty;
                 this.doubleUpDownLength.Value = null;
-                this.doubleUpDownWidth.Value = null;
+                this.doubleUpDownWidth.Value = null;                
             }
             this.CheckForCompletion();
         }
@@ -255,6 +257,10 @@ namespace BreCalClient
                     };
                     this.ShipcallModel.AssignedParticipants[ParticipantType.BSMD] = pa;
                 }
+
+                // set the time reference value (which point do all times refer to?)
+                this.ShipcallModel.Shipcall.TimeRefPoint = this.comboBoxTimeRef.SelectedIndex;
+
             }
         }
 
@@ -263,6 +269,7 @@ namespace BreCalClient
             if (this.ShipcallModel == null) return;
             if (this.ShipcallModel.Shipcall != null)
             {
+                this.comboBoxTimeRef.SelectedIndex = this.ShipcallModel.Shipcall.TimeRefPoint ?? 0;
                 this.comboBoxCategories.SelectedItem = this.ShipcallModel.Shipcall.Type;
                 if (this.ShipcallModel.Shipcall.Eta != DateTime.MinValue)
                     this.datePickerETA.Value = this.ShipcallModel.Shipcall.Eta;
diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
index 45bc985..837f6a4 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml
@@ -43,7 +43,7 @@
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_down_red.png" />
         </Grid>
         
-        <Label Content="ETA" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Label Content="ETA" x:Name="labelETA" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
index fd948de..7cad474 100644
--- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
@@ -4,8 +4,6 @@
 
 using BreCalClient.misc.Model;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using static BreCalClient.Extensions;
 
@@ -14,7 +12,7 @@ namespace BreCalClient
     /// <summary>
     /// Interaction logic for EditTimesAgencyIncomingControl.xaml
     /// </summary>
-    public partial class EditTimesAgencyIncomingControl : Window, IEditShipcallTimesControl
+    public partial class EditTimesAgencyIncomingControl : Window, IEditTimesControl
     {
         #region Construction
 
@@ -29,9 +27,7 @@ namespace BreCalClient
 
         public ShipcallControlModel ShipcallModel { get; set; } = new();
 
-        public Times Times { get; set; } = new();
-
-        public ShipcallType CallType { get; set; }
+        public Times Times { get; set; } = new();        
 
         #endregion
 
@@ -204,6 +200,8 @@ namespace BreCalClient
                 this.checkBoxReplenishingLock.IsChecked = this.ShipcallModel.Shipcall.ReplenishingLock ?? false;
                 this.checkBoxReplenishingTerminal.IsChecked = this.ShipcallModel.Shipcall.ReplenishingTerminal ?? false;
 
+                this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+
                 if(!string.IsNullOrEmpty(this.Times.Remarks)) 
                     this.textBoxRemarks.Text = this.Times.Remarks;
 
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
index bd2a5e9..34e5ed8 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml
@@ -39,7 +39,7 @@
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_up_blue.png" />
         </Grid>
         
-        <Label Content="ETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Label Content="ETD" x:Name="labelETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="2" Margin="2" DisplayMemberPath="Name"  SelectedValuePath="Id">
diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
index b0084ef..ae1a4f6 100644
--- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
@@ -12,7 +12,7 @@ namespace BreCalClient
     /// <summary>
     /// Interaction logic for EditTimesAgencyOutgoingControl.xaml
     /// </summary>
-    public partial class EditTimesAgencyOutgoingControl : Window, IEditShipcallTimesControl
+    public partial class EditTimesAgencyOutgoingControl : Window, IEditTimesControl
     {
 
         #region Construction
@@ -28,9 +28,7 @@ namespace BreCalClient
 
         public ShipcallControlModel ShipcallModel { get; set; } = new();
 
-        public Times Times { get; set; } = new();
-
-        public ShipcallType CallType { get; set; }
+        public Times Times { get; set; } = new();        
 
         #endregion
 
@@ -193,7 +191,10 @@ namespace BreCalClient
 
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
-                if(!string.IsNullOrEmpty(this.Times.Remarks))
+
+                this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+
+                if (!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
 
                 if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.MOORING))
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
index 0f941d1..040f70c 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml
@@ -44,7 +44,7 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingFrom}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Label Content="ETD" x:Name="labelETD" Grid.Column="0" Grid.Row="1"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="1" Grid.Row="1" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
         
         <Label Content="{x:Static p:Resources.textTerminal}" Grid.Column="0" Grid.Row="2"  HorizontalContentAlignment="Right"/>
@@ -75,7 +75,7 @@
             <Label Grid.Column="0" Grid.Row="0" Content="{x:Static p:Resources.textShiftingTo}" FontWeight="DemiBold"/>
             <Image Margin="2" Grid.Column="1" Source="Resources/arrow_right_green.png" />
         </Grid>
-        <Label Content="ETA" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
+        <Label Content="ETA" x:Name="labelETA" Grid.Column="0" Grid.Row="9"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
         <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="1" Grid.Row="9" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm"/>
 
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="10"  HorizontalContentAlignment="Right" FontWeight="Bold"/>
diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
index dfd52d5..eea1a58 100644
--- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
+++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
@@ -12,7 +12,7 @@ namespace BreCalClient
     /// <summary>
     /// Interaction logic for EditTimesAgencyShiftingControl.xaml
     /// </summary>
-    public partial class EditTimesAgencyShiftingControl : Window, IEditShipcallTimesControl
+    public partial class EditTimesAgencyShiftingControl : Window, IEditTimesControl
     {
 
         #region Construction
@@ -28,9 +28,7 @@ namespace BreCalClient
 
         public ShipcallControlModel ShipcallModel { get; set; } = new();
 
-        public Times Times { get; set; } = new();
-
-        public ShipcallType CallType { get; set; }
+        public Times Times { get; set; } = new();        
 
         #endregion
 
@@ -208,7 +206,11 @@ namespace BreCalClient
 
                 this.checkBoxMooredLock.IsChecked = this.ShipcallModel.Shipcall.MooredLock ?? false;
                 this.checkBoxRainsensitiveCargo.IsChecked = this.ShipcallModel.Shipcall.RainSensitiveCargo ?? false;
-                if(!string.IsNullOrEmpty(this.Times.Remarks))
+
+                this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+                this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall.TimeRefPoint ?? 0]);
+
+                if (!string.IsNullOrEmpty(this.Times.Remarks))
                     this.textBoxRemarks.Text = this.Times.Remarks;
 
                 if (this.ShipcallModel.AssignedParticipants.ContainsKey(ParticipantType.MOORING))
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 34c9556..8f4c633 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -25,9 +25,9 @@ namespace BreCalClient
 
         #region Properties
 
-        public Times Times { get; set; } = new();        
+        public Times Times { get; set; } = new();                
 
-        public ShipcallType CallType { get; set; }        
+        public ShipcallControlModel ShipcallModel { get; set; } = new();
 
         #endregion
 
@@ -73,7 +73,10 @@ namespace BreCalClient
             this.datePickerLockTime.Value = this.Times.LockTime;
             this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
 
-            switch (CallType)
+            this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
+            this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
+
+            switch (ShipcallModel.Shipcall?.Type)
             {
                 case ShipcallType.Arrival:
                     this.labelETA.FontWeight = FontWeights.Bold; 
@@ -97,25 +100,17 @@ namespace BreCalClient
                 case Extensions.ParticipantType.MOORING:
                 case Extensions.ParticipantType.PORT_ADMINISTRATION:
                 case Extensions.ParticipantType.TUG:
-                    this.datePickerETABerth.IsEnabled = (CallType == ShipcallType.Arrival);
-                    //this.checkBoxEtaBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerETDBerth.IsEnabled = (CallType == ShipcallType.Departure || CallType == ShipcallType.Shifting);
-                    //this.checkBoxEtDBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerLockTime.IsEnabled = (CallType == ShipcallType.Arrival || CallType == ShipcallType.Shifting);
-                    //this.checkBoxLockTimeFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerZoneEntry.IsEnabled = false;
-                    //this.checkBoxZoneEntryFixed.IsEnabled = false;
+                    this.datePickerETABerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
+                    this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+                    this.datePickerLockTime.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+                    this.datePickerZoneEntry.IsEnabled = false;                    
                     this.textBoxRemarks.IsEnabled = true;
                     break;
                 case Extensions.ParticipantType.PILOT:
-                    this.datePickerETABerth.IsEnabled = (CallType == ShipcallType.Arrival);
-                    //this.checkBoxEtaBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerETDBerth.IsEnabled = (CallType == ShipcallType.Departure || CallType == ShipcallType.Shifting);
-                    //this.checkBoxEtDBerthFixed.IsEnabled = (CallType == Extensions.TypeEnum.Outgoing || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerLockTime.IsEnabled = (CallType == ShipcallType.Arrival || CallType == ShipcallType.Shifting);
-                    //this.checkBoxLockTimeFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming || CallType == Extensions.TypeEnum.Shifting);
-                    this.datePickerZoneEntry.IsEnabled = (CallType == ShipcallType.Arrival);
-                    //this.checkBoxZoneEntryFixed.IsEnabled = (CallType == Extensions.TypeEnum.Incoming);
+                    this.datePickerETABerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);                    
+                    this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);                    
+                    this.datePickerLockTime.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);                    
+                    this.datePickerZoneEntry.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);                    
                     this.textBoxRemarks.IsEnabled = true;
                     break;
             }
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index 888506e..a99d682 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -21,7 +21,7 @@ namespace BreCalClient
 
         public Times Times { get; set; } = new();
 
-        public ShipcallType CallType { get; set; }
+        public ShipcallControlModel ShipcallModel { get; set; } = new();
 
         #endregion
 
@@ -95,7 +95,7 @@ namespace BreCalClient
             this.textBoxRemarks.Text = this.Times.Remarks;
             this.textBoxBerthRemarks.Text = this.Times.BerthInfo;
 
-            switch (CallType)
+            switch (ShipcallModel.Shipcall?.Type)
             {
                 case ShipcallType.Arrival:
                     this.labelStart.FontWeight = FontWeights.Bold;
@@ -114,11 +114,11 @@ namespace BreCalClient
         {
             if (this.Times.ParticipantId != App.Participant.Id) return;
 
-            this.datePickerOperationStart.IsEnabled = CallType == ShipcallType.Arrival;
-            this.datePickerOperationEnd.IsEnabled = (CallType == ShipcallType.Departure) || (CallType == ShipcallType.Shifting);
-            this.comboBoxBerth.IsEnabled = CallType == ShipcallType.Arrival;
-            this.comboBoxPierside.IsEnabled = CallType == ShipcallType.Arrival;
-            this.textBoxBerthRemarks.IsEnabled = CallType == ShipcallType.Arrival;
+            this.datePickerOperationStart.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
+            this.datePickerOperationEnd.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+            this.comboBoxBerth.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
+            this.comboBoxPierside.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
+            this.textBoxBerthRemarks.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
             this.textBoxRemarks.IsEnabled = true;
             this.buttonOK.IsEnabled = true;
         }
diff --git a/src/BreCalClient/IEditTimesControl.cs b/src/BreCalClient/IEditTimesControl.cs
index 00f97b0..3271788 100644
--- a/src/BreCalClient/IEditTimesControl.cs
+++ b/src/BreCalClient/IEditTimesControl.cs
@@ -13,15 +13,10 @@ namespace BreCalClient
 
         string Title { get; set; }
 
-        ShipcallType CallType { get; set; }
+        ShipcallControlModel ShipcallModel { get; set; }
 
         bool? ShowDialog();
 
-    }
-
-    internal interface IEditShipcallTimesControl : IEditTimesControl
-    {
-        ShipcallControlModel ShipcallModel { get; set; }
-    }
+    }    
 
 }
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index ffc3872..dd2ba08 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -760,9 +760,7 @@ namespace BreCalClient
             // show a dialog that lets the user create / update times for the given shipcall
             IEditTimesControl etc = (participantType == ParticipantType.TERMINAL) ? new EditTimesTerminalControl() : new EditTimesControl();
             etc.Title = obj.ShipcallControlModel.Title;
-
-            if(obj.ShipcallControlModel.Shipcall != null)
-                etc.CallType = (ShipcallType) obj.ShipcallControlModel.Shipcall.Type;
+            etc.ShipcallModel = obj.ShipcallControlModel;
 
             bool wasEdit = false;
             if (times != null)
@@ -812,7 +810,7 @@ namespace BreCalClient
 
         private async void Sc_EditAgencyRequested(ShipcallControl sc, Times? times)
         {
-            IEditShipcallTimesControl? editControl = null;
+            IEditTimesControl? editControl = null;
             switch(sc.ShipcallControlModel?.Shipcall?.Type)
             {
                 case ShipcallType.Arrival: