diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ce4b7577..dde2bee0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,23 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/ConfigurationCache.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCaches.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/VisualCache/VisualCaches.java b/src/Common/UI/VisualCache/VisualCaches.java
index d249840f..00dbc199 100644
--- a/src/Common/UI/VisualCache/VisualCaches.java
+++ b/src/Common/UI/VisualCache/VisualCaches.java
@@ -26,11 +26,11 @@ public class VisualCaches {
         return new VisualCache();
     }
     public static VisualCache GetCache(DBObject object) {
-       // System.out.println("get visual cache for " + object.getPK()+" "+object.getClass());
         VisualCache res = null;
         LinkedHashMap<Object, VisualCache> data = getDataForClass(object.getClass());
         if (!data.containsKey(object.getPK())) {
-         //   System.out.println("cache not found, creating...");
+       //     System.out.println("get visual cache for " + object.getPK()+" "+object.getClass());
+       //     System.out.println("cache not found, creating...");
             data.put(object.getPK(), res = createCache(object));
         } else {
           //  System.out.println("cache found");
@@ -42,7 +42,7 @@ public class VisualCaches {
         DeleteCache(object.getClass(), object.getPK());
     }
     public static void DeleteCache(Class class_, Object pk){
-    //    System.out.println("Delete for " + pk+" "+class_);
+      //  System.out.println("Delete for " + pk+" "+class_);
         LinkedHashMap<Object, VisualCache> data = getDataForClass(class_);
         if (data.containsKey(pk))
             data.remove(pk);
diff --git a/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java b/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java
index f28c0128..a98f66cf 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java
@@ -1,10 +1,11 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
+import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import Visual_DVM_2021.Passes.SaveCurrentConfiguration;
-public class SaveCurrentSAPFORConfiguration extends SaveCurrentConfiguration<DVMConfiguration> {
+public class SaveCurrentSAPFORConfiguration extends SaveCurrentConfiguration<SapforConfiguration> {
     public SaveCurrentSAPFORConfiguration() {
-        super(DVMConfiguration.class);
+        super(SapforConfiguration.class);
     }
     @Override
     public Current currentName() {