diff --git a/ENI2/App.config b/ENI2/App.config
index 4c7c4bc1..6105b6f2 100644
--- a/ENI2/App.config
+++ b/ENI2/App.config
@@ -29,7 +29,7 @@
 				<value>http://192.168.2.24/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>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 44a77a3a..754f2036 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -18,7 +18,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
-    <PublishUrl>eni2.publish\</PublishUrl>
+    <PublishUrl>eni_test\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -28,16 +28,16 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://192.168.2.24/eni2.publish/</InstallUrl>
+    <InstallUrl>http://192.168.2.24/eni_test/</InstallUrl>
     <SupportUrl>http://www.textbausteine.net/</SupportUrl>
-    <ProductName>ENI</ProductName>
+    <ProductName>ENI Testversion</ProductName>
     <PublisherName>Informatikbüro Daniel Schick</PublisherName>
     <SuiteName>NSW</SuiteName>
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.9.11.0</ApplicationVersion>
+    <ApplicationVersion>6.9.12.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -86,7 +86,7 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>9B5725EAD90F2E06094631407417EB2554E88941</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>94D98790E3B6C4CC9F4B57C8FD305E3225894DF8</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>true</SignManifests>
diff --git a/ENI2/Excel/ExcelBase.cs b/ENI2/Excel/ExcelBase.cs
index 0ce4f50a..fc55d48c 100644
--- a/ENI2/Excel/ExcelBase.cs
+++ b/ENI2/Excel/ExcelBase.cs
@@ -16,7 +16,7 @@ namespace ENI2.Excel
 
         internal enum CountryMode { NONE, DE, DK };
 
-        protected CountryMode _countryMode = CountryMode.NONE;
+        protected CountryMode _countryMode = CountryMode.DE;
 
         protected Workbooks _excelWorkbooks;
         protected Workbook _workBook;
diff --git a/ENI2/Report/ReportManager.cs b/ENI2/Report/ReportManager.cs
index 31b9d88b..5747a5cd 100644
--- a/ENI2/Report/ReportManager.cs
+++ b/ENI2/Report/ReportManager.cs
@@ -49,9 +49,24 @@ namespace ENI2.Report
 
             try
             {
+                string etaDisplay = "";
+                foreach (Message message in reportMessages)
+                {
+                    if(message.MessageNotificationClass == Message.NotificationClass.NOA_NOD)
+                    {
+                        if (message.Elements[0] is NOA_NOD noa_nod)
+                        {
+                            if (core.IsTransit && noa_nod.ETAToKielCanal.HasValue)
+                                etaDisplay = noa_nod.ETAToKielCanal.Value.ToLocalTime().ToString();
+                            if (!core.IsTransit && noa_nod.ETAToPortOfCall.HasValue)
+                                etaDisplay = noa_nod.ETAToPortOfCall.Value.ToLocalTime().ToString();
+                        }
+                    }
+                }
+
                 Dictionary<string, string> coverInfos = new Dictionary<string, string>();
                 coverInfos.Add("Ship", DBManager.Instance.GetShipNameFromCore(core));
-                coverInfos.Add("ETA", core.ETA_NOA_NOD.HasValue ? core.ETA_NOA_NOD.Value.ToLocalTime().ToString() : "");
+                coverInfos.Add("ETA", etaDisplay);
                 coverInfos.Add("Port of call", core.Portname);
                 coverInfos.Add("Visit-ID", core.DisplayId);
                 coverInfos.Add("Class", classes);
diff --git a/ENI2/Resources/EUREPORT.png b/ENI2/Resources/EUREPORT.png
index f3724082..375b2af7 100644
Binary files a/ENI2/Resources/EUREPORT.png and b/ENI2/Resources/EUREPORT.png differ
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index c6d42b70..2fa8db8a 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("6.9.11")]
-[assembly: AssemblyCopyright("Copyright ©  2014-2021 schick Informatik")]
+[assembly: AssemblyInformationalVersion("6.9.12")]
+[assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index 0c60ba43..e45cf5bb 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.9.11.*")]
+[assembly: AssemblyVersion("6.9.12.*")]