diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config
index 7ed44e2e..9a1f36c7 100644
--- a/ENI-2/ENI2/ENI2/App.config
+++ b/ENI-2/ENI2/ENI2/App.config
@@ -26,12 +26,12 @@
                 <value>1000</value>
             </setting>
             <setting name="LockingServerAddress" serializeAs="String">
-				<value>http://192.168.2.24/LockingService/LockingService.svc</value>
-					<!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
+				<!--value>http://192.168.2.24/LockingService/LockingService.svc</value-->
+					<value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-				<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
-					<!--value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value-->
+				<!--value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value-->
+					<value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value>
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
index f127042d..c6b0e3eb 100644
--- a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
@@ -144,6 +144,7 @@ namespace ENI2.Controls
                     case 1: if (core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.filteredResult.Add(core); break;
                     case 2: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.filteredResult.Add(core); break;
                     case 3: if (core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.filteredResult.Add(core); break;
+                    case 4: if (core.IsFlagSet(MessageCore.CoreFlags.HOEGH)) this.filteredResult.Add(core); break;
                 }
             }
             this.dataGridPOCores.ItemsSource = this.filteredResult;            
@@ -179,6 +180,7 @@ namespace ENI2.Controls
                     editedCore.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
                     editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
                     editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
+                    editedCore.SetFlag(false, MessageCore.CoreFlags.HOEGH);
                     if (coreFlag != MessageCore.CoreFlags.NONE)
                     {
                         editedCore.SetFlag(true, coreFlag);
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
index d0959f01..bde35ae3 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
@@ -18,6 +18,7 @@
             <col:DictionaryEntry Key="Maersk BHV" Value="1" />
             <col:DictionaryEntry Key="SeaGo BHV" Value="2" />
             <col:DictionaryEntry Key="SeaGo WHV" Value="4" />
+            <col:DictionaryEntry Key="Hoegh BHV" Value="8" />
         </col:ArrayList>
     </UserControl.Resources>
     <GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
index be1e22fe..605f2730 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
@@ -158,6 +158,7 @@ namespace ENI2.DetailViewControls
             if (this.Core.IsFlagSet(MessageCore.CoreFlags.MAERSK_BHV)) this.comboBoxGroup.SelectedIndex = 1;
             if (this.Core.IsFlagSet(MessageCore.CoreFlags.SEAGO_BHV)) this.comboBoxGroup.SelectedIndex = 2;
             if (this.Core.IsFlagSet(MessageCore.CoreFlags.SEAGO_WHV)) this.comboBoxGroup.SelectedIndex = 3;
+            if (this.Core.IsFlagSet(MessageCore.CoreFlags.HOEGH)) this.comboBoxGroup.SelectedIndex = 4;
 
             #endregion
         }
@@ -369,12 +370,14 @@ namespace ENI2.DetailViewControls
             this.Core.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
             this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
             this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
+            this.Core.SetFlag(false, MessageCore.CoreFlags.HOEGH);
 
             DictionaryEntry selectedItem = (DictionaryEntry) this.comboBoxGroup.SelectedItem;
             if(Int32.TryParse((string)selectedItem.Value, out int selectedValue))
             {
                 if (selectedValue == (int)MessageCore.CoreFlags.MAERSK_BHV) CheckServiceEntryMaerskBHV();
                 if (selectedValue == (int)MessageCore.CoreFlags.SEAGO_BHV) CheckServiceEntrySeaGoBHV();
+                if (selectedValue == (int)MessageCore.CoreFlags.HOEGH) CheckServiceEntryHoegh();
                 this.Core.SetFlag(true, (MessageCore.CoreFlags)selectedValue);
                 DBManager.Instance.Save(this.Core);
             }                                                    
@@ -430,6 +433,30 @@ namespace ENI2.DetailViewControls
             }
         }
 
+        private void CheckServiceEntryHoegh()
+        {
+            bool found = false;
+            foreach (SERV serv in this._servMessage.Elements)
+            {
+                if (serv.ServiceBeneficiary.Equals("Höegh Autoliners AS, Oslo, Norway"))
+                    found = true;
+            }
+
+            if (!found)
+            {
+                SERV newServ = new SERV();
+                newServ.ServiceBeneficiary = "Höegh Autoliners AS, Oslo, Norway";
+                newServ.ServiceInvoiceRecipient = " PWL Port Services GmbH & Co. KG";
+                newServ.ServiceName = "HOEGH BHV";
+                newServ.MessageHeader = this._servMessage;
+                newServ.Identifier = SERV.GetNewIdentifier(_servMessage.Elements);
+                this._servMessage.Elements.Add(newServ);
+                this.dataGridSERV.Items.Refresh();
+                this.SublistElementChanged(Message.NotificationClass.SERV);
+            }
+        }
+
+
         #endregion
 
     }
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index a06265d2..201022c4 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/MessageCore.cs b/nsw/Source/bsmd.database/MessageCore.cs
index dad57226..ea8ab4d2 100644
--- a/nsw/Source/bsmd.database/MessageCore.cs
+++ b/nsw/Source/bsmd.database/MessageCore.cs
@@ -93,7 +93,8 @@ namespace bsmd.database
             NONE = 0,
             MAERSK_BHV = 1,
             SEAGO_BHV = 2,
-            SEAGO_WHV = 4
+            SEAGO_WHV = 4,
+            HOEGH = 8
         }
 
         #endregion