diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a57030eb..691c74f3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,9 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java b/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java
index 65fb6c0b..12cf9d5e 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java
@@ -1,7 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Loops;
-import Common.Utils.Index;
 import Common.Visual.Fonts.VisualiserFonts;
-import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Messages.Message;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
@@ -21,13 +19,13 @@ public class Loop extends FileObjectWithMessages {
     public LoopState loopState;
     //---
     @Expose
-    public List<FuncCall> func_calls = new Vector<>();
+    public List<FuncCall> funcCalls = new Vector<>();
+  //  @Expose
+   // public List<NonRectIter> non_rect_iters = new Vector<>();
     @Expose
-    public List<NonRectIter> non_rect_iters = new Vector<>();
+    public List<EGoto> extGotos = new Vector<>();
     @Expose
-    public List<EGoto> e_gotos = new Vector<>();
-    @Expose
-    public List<IGoto> i_gotos = new Vector<>();
+    public List<IGoto> intGotos = new Vector<>();
     @Expose
     public List<IO> ios = new Vector<>();
     @Expose
@@ -37,10 +35,10 @@ public class Loop extends FileObjectWithMessages {
     //--
     public List<FileObjectWithMessages> getAllChildren(){
         List<FileObjectWithMessages> all_children = new Vector<>();
-        all_children.addAll(func_calls);
-        all_children.addAll(non_rect_iters);
-        all_children.addAll(e_gotos);
-        all_children.addAll(i_gotos);
+        all_children.addAll(funcCalls);
+      //  all_children.addAll(non_rect_iters);
+        all_children.addAll(extGotos);
+        all_children.addAll(intGotos);
         all_children.addAll(ios);
         all_children.addAll(stops);
         all_children.addAll(children);