diff --git a/at/fos/ermodel/gui/ZZ30.java b/at/fos/ermodel/gui/ZZ30.java
index e2b4024..d745782 100644
--- a/at/fos/ermodel/gui/ZZ30.java
+++ b/at/fos/ermodel/gui/ZZ30.java
@@ -243,10 +243,20 @@ public class ZZ30 {
                     ArrayList<C3> keyColumns = this.relationalModel.getKeyColumnsGivenRelation(gesme_conn.sdfsdfsdfd());
 
                     T1 tableRS = this.relationalModel.getTableGivenNumber(grsem.sdfsdfsdfd());
-                    for (C3 refcolumn : keyColumns) {
 
-                        boolean colExists = tableRS.columnExist(tableRS.getTablenamePraefix() + refcolumn.getColumnName());
-                        C3 column = new C3(tableRS.getTablenamePraefix() + refcolumn.getColumnName() + (colExists ? "_1" : ""),
+                    for (C3 refcolumn : keyColumns) {
+                        String colname = refcolumn.getColumnName();
+                        boolean colExists = tableRS.columnExist(tableRS.getTablenamePraefix() + colname);
+                        if(colExists && colname.matches(".+_\\d")) {
+                            String scolname = colname.substring(0, colname.lastIndexOf("_"));
+                            int num = Integer.parseInt(refcolumn.getColumnName().substring(colname.lastIndexOf("_") + 1)) + 1;
+                            if(!tableRS.columnExist(tableRS.getTablenamePraefix() + scolname + "_" + num)) {
+                                colname = scolname + "_" + num;
+                            }
+                            colExists = false;
+                        }
+
+                        C3 column = new C3(tableRS.getTablenamePraefix() + colname + (colExists ? "_1" : ""),
                                 refcolumn.getDatatype(),
                                 partPrimary,
                                 false,
diff --git a/noEasyDB_optimized.jar b/noEasyDB_optimized.jar
deleted file mode 100644
index aaed2c4..0000000
Binary files a/noEasyDB_optimized.jar and /dev/null differ
diff --git a/noEasyDB_optimized_old.jar b/noEasyDB_optimized_old.jar
deleted file mode 100644
index d3e842c..0000000
Binary files a/noEasyDB_optimized_old.jar and /dev/null differ
diff --git a/obfuscate.bat b/obfuscate.bat
deleted file mode 100644
index 166e237..0000000
--- a/obfuscate.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-java -jar C:\Users\code0\javaObfuscation/SkidObfuscator.jar obfuscate out/artifacts/noEasyDB/noEasyDB.jar
-mv out/artifacts/noEasyDB/noEasyDB.jar-out.jar ./
-mv out/artifacts/noEasyDB/noEasyDB.jar ./
diff --git a/optimize.bat b/optimize.bat
deleted file mode 100644
index 8df7688..0000000
--- a/optimize.bat
+++ /dev/null
@@ -1 +0,0 @@
-proguard\bin\proguard.bat -verbose -injar out/artifacts/noEasyDB/noEasyDB.jar -outjars noEasyDB_optimized.jar -keep class at.fos.ermodel.gui.A1 { *; } -libraryjars "<java.home>/jmods/java.desktop.jmod;<java.home>/jmods/java.base.jmod;<java.home>/jmods/javafx.base.jmod;<java.home>/jmods/javafx.graphics.jmod;<java.home>/jmods/javafx.controls.jmod;<java.home>/jmods/javafx.swing.jmod"
\ No newline at end of file