diff --git a/CMDB2CSV_Aufbaumaster.py b/CMDB2CSV_Aufbaumaster.py
index 34794759..332a871f 100755
--- a/CMDB2CSV_Aufbaumaster.py
+++ b/CMDB2CSV_Aufbaumaster.py
@@ -69,6 +69,9 @@ class MainUI(QDialog): # erbt von QDialog
         # Einfügen von Spalten in die CMDB-Tabelle
         self.dfb = self.df_vte.merge(self.df_cmdb, on=['Hostname'], how='left')
         
+        # Spalte für Mandanten Kontaktzuweisung
+        self.dfb.insert(loc=7, column='Mandanten Kontaktzuweisung', value='Mandant')
+
         # Spalte für Segmente
         self.dfb.insert(loc=8, column='Segment', value='')
 
@@ -76,13 +79,22 @@ class MainUI(QDialog): # erbt von QDialog
         self.dfb.insert(loc=9, column='Domain', value='')
 
         # Spalte einfügen für HE
-        self.dfb.insert(loc=13, column='HE', value='')
+        self.dfb.insert(loc=14, column='HE', value='')
 		
         # Einschub
-        self.dfb.insert(loc=14, column='Einschub', value='')
+        self.dfb.insert(loc=15, column='Einschub', value='')
 		
         # Montage --> nur horizontal
-        self.dfb.insert(loc=15, column='Montage', value='horizontal')
+        self.dfb.insert(loc=16, column='Montage', value='horizontal')
+		
+        # Formfaktor
+        self.dfb.insert(loc=17, column='Formfaktor', value='19"')
+        
+        # Anzahl HE
+        #self.dfb.insert(loc=19, column='belegte\nHE', value='')
+		
+        # Masseinheit
+        self.dfb.insert(loc=18, column='Masseinheit', value='Zoll')
 
         # Führende Leerzeichen in allen Spalten entfernen
         self.dfb = self.dfb.apply(lambda x: x.str.lstrip() if x.dtype == "object" else x)
@@ -112,6 +124,8 @@ class MainUI(QDialog): # erbt von QDialog
             else:
                 zeile['HE'] = zeile['Montageort'][8:10]
                 zeile['Montageort'] = zeile['Montageort'][0:7]
+		# TODO:
+		# Einschub vorn/hinten einbauen
     
             
         if zeile['Hersteller'].lower() == "cisco":
@@ -124,45 +138,58 @@ class MainUI(QDialog): # erbt von QDialog
             pass
         
         ################################################################
-        if zeile['Hostname'][4:6] == "10": 
-          zeile['ID\nMandanten'] = 'm10 CMP Plattform / iM.0 / iM.4 / PAP sIMCP'
-          if zeile['Hostname'][4:8] == "1011":
-            zeile['Domain'] = 'im0.t-cmp.de'
-          else:
-            zeile['Domain'] = 'mgmt.t-cmp.de'
+        if zeile['Hostname'][4:6] == "10":
+            zeile['ID\nMandanten'] = 'm10 CMP Plattform / iM.0 / iM.4 / PAP sIMCP'
+            if zeile['Hostname'][4:8] == "1011":
+                zeile['Domain'] = 'im0.t-cmp.de'
+            elif zeile['Hostname'][4:8] == "1015":
+                zeile['Domain'] = 'im4.t-cmp.de'  
+            else:
+                zeile['Domain'] = 'mgmt.t-cmp.de'
         elif zeile['Hostname'][4:6] == "19":
-          zeile['ID\nMandanten'] = 'm19 Testumgebung'
-          if zeile['Hostname'][4:8].isin("1920","1921"):
-            zeile['Domain'] = 'm19.t-cmp.de'
-          else:
-            zeile['Domain'] = 'm193.t-cmp.de'
+            zeile['ID\nMandanten'] = 'm19 Testumgebung'
+            if zeile['Hostname'][4:8].isin("1920","1921"):
+                zeile['Domain'] = 'm19.t-cmp.de'
+            else:
+                zeile['Domain'] = 'm193.t-cmp.de'
         elif zeile['Hostname'][4:6] == "20":
             zeile['ID\nMandanten'] = 'm20 iM.1 Interner Mandant (Schutzbedarf sehr hoch)'
             zeile['Domain'] = 'im1.t-cmp.de'
         elif zeile['Hostname'][4:6] == "21":
             zeile['ID\nMandanten'] = 'm21 iM.2 Interner Mandant (Schutzbedarf normal)'    
+            zeile['Domain'] = 'im2.t-cmp.de'
         elif zeile['Hostname'][4:6] == "22":
-            zeile['ID\nMandanten'] = 'm22 iM.3 Interner Mandant (Schutzbedarf hoch)'    
+            zeile['ID\nMandanten'] = 'm22 iM.3 Interner Mandant (Schutzbedarf hoch)'
+            zeile['Domain'] = 'im3.t-cmp.de'             
         elif zeile['Hostname'][4:6] == "50":
-            zeile['ID\nMandanten'] = 'm50 sEMCP.Instanz-1 (CMP Zentral)'    
+            zeile['ID\nMandanten'] = 'm50 sEMCP.Instanz-1 (CMP Zentral)'
+            zeile['Domain'] = 'm50.t-cmp.de'  
         elif zeile['Hostname'][4:6] == "51":
-            zeile['ID\nMandanten'] = 'm51 Classified OPS'                
+            zeile['ID\nMandanten'] = 'm51 Classified OPS'
+            zeile['Domain'] = 'm51.t-cmp.de'
         elif zeile['Hostname'][4:6] == "73":
             zeile['ID\nMandanten'] = 'm73 FWP Lüftersteuerung'
+            zeile['Domain'] = 'm73.t-cmp.de'             
         elif zeile['Hostname'][4:6] == "75":
-            zeile['ID\nMandanten'] = 'm75 Fawkes'                
+            zeile['ID\nMandanten'] = 'm75 Fawkes'
+            zeile['Domain'] = 'm75.t-cmp.de'            
         elif zeile['Hostname'][4:6] == "76":
-            zeile['ID\nMandanten'] = 'm76 Demo'                
+            zeile['ID\nMandanten'] = 'm76 Demo'
+            zeile['Domain'] = 'm76.t-cmp.de'
         elif zeile['Hostname'][4:6] == "77":
-            zeile['ID\nMandanten'] = 'm77 Fritz54    '                        
+            zeile['ID\nMandanten'] = 'm77 Fritz54'
+            zeile['Domain'] = 'm77.t-cmp.de'
         elif zeile['Hostname'][4:6] == "78":
-            zeile['ID\nMandanten'] = 'm78 ITZBund mSBC'                
+            zeile['ID\nMandanten'] = 'm78 ITZBund mSBC'
+            zeile['Domain'] = 'm78.t-cmp.de'
         elif zeile['Hostname'][4:6] == "79":
-            zeile['ID\nMandanten'] = 'm79 BOS-Spur'                
+            zeile['ID\nMandanten'] = 'm79 BOS-Spur'
+            zeile['Domain'] = 'm79.t-cmp.de'
         elif zeile['Hostname'][4:6] == "99":
-            zeile['ID\nMandanten'] = 'm99 Releasemanagement'                
+            zeile['ID\nMandanten'] = 'm99 Releasemanagement'
         elif zeile['Hostname'][4:6] == "80":
-            zeile['ID\nMandanten'] = 'm80 ACDC'      
+            zeile['ID\nMandanten'] = 'm80 ACDC'
+            zeile['Domain'] = 'm80.t-cmp.de'
 
         ################################################################