diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dd91376..e527511 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,13 +6,10 @@
   <component name="ChangeListManager">
     <list default="true" id="12bd6c53-8ba7-454c-a61e-7a76cc3b801b" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/fr/impl/CategoryImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/CategoryImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/fr/impl/CompatibilityCheckerImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/CompatibilityCheckerImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/fr/impl/CompatibilityManagerImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/CompatibilityManagerImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/fr/impl/ConfigurationImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/ConfigurationImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/fr/impl/ConfiguratorImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/ConfiguratorImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/fr/impl/PartImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/PartImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/fr/impl/PartTypeImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/PartTypeImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/fr/impl/Parts/Engine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/Parts/Engine.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/fr/impl/Parts/Interior.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/impl/Parts/Interior.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/fr/test/test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/fr/test/test.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,7 +42,7 @@
   "keyToString": {
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "git-widget-placeholder": "dev__v2",
+    "git-widget-placeholder": "Merging dev__v2",
     "ignore.virus.scanning.warn.message": "true",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "C:/Users/vumin/Desktop/M1/ALO/cartailor",
@@ -90,6 +87,7 @@
       <workItem from="1729757559608" duration="166000" />
       <workItem from="1729764402753" duration="206000" />
       <workItem from="1731196687641" duration="82000" />
+      <workItem from="1733327767478" duration="184000" />
     </task>
     <servers />
   </component>
diff --git a/src/fr/impl/Parts/Engine.java b/src/fr/impl/Parts/Engine.java
index 2cf5c18..80a8cf5 100644
--- a/src/fr/impl/Parts/Engine.java
+++ b/src/fr/impl/Parts/Engine.java
@@ -1,5 +1,10 @@
 package src.fr.impl.Parts;
 
+
+import java.util.Set;
+
+import org.junit.Test.None;
+
 import src.fr.impl.CategoryImpl;
 import src.fr.impl.PartImpl;
 import src.fr.impl.PartTypeImpl;
diff --git a/src/fr/impl/Parts/Exterior.java b/src/fr/impl/Parts/Exterior.java
index 702bc61..389b866 100644
--- a/src/fr/impl/Parts/Exterior.java
+++ b/src/fr/impl/Parts/Exterior.java
@@ -1,6 +1,7 @@
 package src.fr.impl.Parts;
 
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 
 import src.fr.impl.CategoryImpl;