diff --git a/src/MISP_maltego/resources/maltego/misp_MISPEventToAll.machine b/src/MISP_maltego/resources/maltego/misp_MISPEventToAll.machine
index a34a033..7cec58c 100644
--- a/src/MISP_maltego/resources/maltego/misp_MISPEventToAll.machine
+++ b/src/MISP_maltego/resources/maltego/misp_MISPEventToAll.machine
@@ -3,16 +3,22 @@ machine("misp.MISPEventToAll",
         author:"Christophe Vandeplas",
         description: "Automatically expands MISP Objects to their attributes") {
     start {
-        run("MISP_maltego.EventToAttributes")
-        run("MISP_maltego.AttributeToEvent")
         paths {
             path {
-                run("MISP_maltego.ObjectToAttributes")
-                // run("MISP_maltego.AttributeToEvent")
+                run("MISP_maltego.EventToAttributes")
+                paths {
+                    path {
+                        run("MISP_maltego.AttributeToEvent")                
+                    }
+                    path {
+                        run("MISP_maltego.ObjectToAttributes")
+                    }
+                }
             }
             path {
+                run("MISP_maltego.EventToTags")
                 run("MISP_maltego.GalaxyToRelations")
-            }
+            }  
         }
         
     }
diff --git a/src/MISP_maltego/resources/maltego/misp_MISPEventToAttributes.machine b/src/MISP_maltego/resources/maltego/misp_MISPEventToAttributes.machine
index 126b29f..8491e9e 100644
--- a/src/MISP_maltego/resources/maltego/misp_MISPEventToAttributes.machine
+++ b/src/MISP_maltego/resources/maltego/misp_MISPEventToAttributes.machine
@@ -4,10 +4,14 @@ machine("misp.MISPEventToAttributes",
         description: "Also automatically expands MISP Objects to their attributes") {
     start {
         paths {
-            run("MISP_maltego.EventToAttributes")
             path {
+                run("MISP_maltego.EventToObjects")
                 run("MISP_maltego.ObjectToAttributes")
             }
+            path {
+                run("MISP_maltego.EventToAttributes")
+            
+            }
         }
     }
 }