diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb
index 5475933..911dfc5 100644
--- a/Aviso/frmATEZ_NCTS.vb
+++ b/Aviso/frmATEZ_NCTS.vb
@@ -1,10 +1,4 @@
-Imports System.Web.UI.WebControls
-Imports com.esendex.sdk.sent
-Imports DocumentFormat.OpenXml.Drawing.Charts
-Imports DocumentFormat.OpenXml.Vml.Presentation
-Imports GrapeCity.ActiveReports.Design.DdrDesigner.Designers
-Imports GrapeCity.ActiveReports.ReportsCore.Tools
-Imports Newtonsoft.Json.Linq
+
 Imports SDL
 Imports VERAG_PROG_ALLGEMEIN
 
@@ -31,7 +25,7 @@ Public Class frmATEZ_NCTS
     Dim id As Integer = -1
     Dim dgv As DataGridView = Nothing
     Dim atez_data As cATEZ_NCTS_DATA
-    Dim atez = New cATEZ_NCTS_IN
+    Dim atez = New cATEZ_NCTS_IN("atez")
     Dim allSelected As Boolean = False
 
     Property BezugsNr As String = ""
diff --git a/Aviso/frmDigicust.vb b/Aviso/frmDigicust.vb
index d7cecb2..10241ad 100644
--- a/Aviso/frmDigicust.vb
+++ b/Aviso/frmDigicust.vb
@@ -5,7 +5,7 @@ Imports VERAG_PROG_ALLGEMEIN
 Public Class frmDigicust
 
 
-    Dim api As cDigicustAPI
+    Dim api As New cDigicustAPI("digicust")
     Dim dig_sendung As New cDigicustSendungen
 
     Dim ART As String = ""
diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb
index 4fa1078..01357c7 100644
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -591,7 +591,7 @@ Public Class frmHauptfenster
 
             If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
                 If Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasNichtStempeln Then
-                    Dim timas As New cTimasAPI
+                    Dim timas As New cTimasAPI("timas")
                     Dim infoMessage As New DataTable
                     Dim timeEntryExisting As Boolean = False
                     Dim isEndpointRunning As Boolean = True
@@ -2881,33 +2881,34 @@ Public Class frmHauptfenster
     Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
 
         Try
+            If False Then
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
+                    If Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasNichtStempeln Then
+                        Dim timas As New cTimasAPI("timas")
+                        Dim infoMessage As New DataTable
+                        Dim timeEntryExisting As Boolean = False
+                        Dim isEndpointRunning As Boolean = True
+                        Dim isPresent = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning)
+                        If timeEntryExisting AndAlso isEndpointRunning AndAlso isPresent Then
+                            Dim a As MsgBoxResult = MsgBox("Soll " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " ausgestempelt werden?" & vbNewLine & Now.ToString() & " als Endzeit erfassen?", vbYesNo)
+                            If a = vbYes Then
+                                Dim info
+                                timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "out")
+                                MsgBox(info)
+                            Else
 
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
-                If Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasNichtStempeln Then
-                    Dim timas As New cTimasAPI
-                    Dim infoMessage As New DataTable
-                    Dim timeEntryExisting As Boolean = False
-                    Dim isEndpointRunning As Boolean = True
-                    Dim isPresent = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning)
-                    If timeEntryExisting AndAlso isEndpointRunning AndAlso isPresent Then
-                        Dim a As MsgBoxResult = MsgBox("Soll " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " ausgestempelt werden?" & vbNewLine & Now.ToString() & " als Endzeit erfassen?", vbYesNo)
-                        If a = vbYes Then
-                            Dim info
-                            timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "out")
-                            MsgBox(info)
-                        Else
+                            End If
 
                         End If
 
                     End If
-
                 End If
             End If
-
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
 
+
         Me.Close()
     End Sub
 
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index 77c4b96..c832fc6 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -6614,7 +6614,7 @@ Public Class frmSendungsdetailsNEU
 
     Private Sub StatusAbrufenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StatusAbrufenToolStripMenuItem.Click
         Dim digiSendung As New cDigicustSendungen(dgvDigicust.SelectedRows(0).Cells("Id").Value)
-        Dim API = New cDigicustAPI()
+        Dim API = New cDigicustAPI("digicust")
         API.fetchingCase(digiSendung)
 
         initdgvDigicust(SENDUNG_LIST(CURRENT_INDEX))