diff --git a/src/main/java/electrosphere/main/project/parsers/BTreeParser.java b/src/main/java/electrosphere/main/project/parsers/BTreeParser.java
index 5a4aa94..af1fecd 100644
--- a/src/main/java/electrosphere/main/project/parsers/BTreeParser.java
+++ b/src/main/java/electrosphere/main/project/parsers/BTreeParser.java
@@ -96,6 +96,9 @@ public class BTreeParser {
             //
             //
             rVal.addImport("electrosphere.net.synchronization.enums.BehaviorTreeIdEnums");
+            rVal.addImport("electrosphere.entity.EntityDataStrings");
+            rVal.addImport("electrosphere.engine.Globals");
+            rVal.addImport("electrosphere.entity.btree.BehaviorTree");
         }
         
         //
diff --git a/src/main/java/electrosphere/main/server/syncmanager/methods/UpdateEntityState.java b/src/main/java/electrosphere/main/server/syncmanager/methods/UpdateEntityState.java
index 4ea30d0..6a0fcc6 100644
--- a/src/main/java/electrosphere/main/server/syncmanager/methods/UpdateEntityState.java
+++ b/src/main/java/electrosphere/main/server/syncmanager/methods/UpdateEntityState.java
@@ -29,8 +29,16 @@ public class UpdateEntityState implements VirtualMethod {
                 String serverTreeName = serverTree.getClassName();
                 updateCases = updateCases + "        case BehaviorTreeIdEnums." + BTreeIdEnum.getTreeIdEnum(clientEquivalent) + ": {\n";
                 updateCases = updateCases + "            " + serverTreeName + " tree = " + serverTreeName + ".get" + serverTreeName + "(entity);\n";
-                updateCases = updateCases + "            tree.start();\n";
+                updateCases = updateCases + "            switch(message.getbTreeValue()){\n";
+                updateCases = updateCases + "                case ServerSynchronizationManager.SERVER_SYNC_START: {\n";
+                updateCases = updateCases + "                   tree.start();\n";
+                updateCases = updateCases + "                } break;\n";
+                updateCases = updateCases + "                case ServerSynchronizationManager.SERVER_SYNC_INTERRUPT: {\n";
+                updateCases = updateCases + "                   tree.interrupt();\n";
+                updateCases = updateCases + "                } break;\n";
+                updateCases = updateCases + "            }\n";
                 updateCases = updateCases + "        } break;\n";
+                
             }
         }
         String fullReplacementText = TemplateInjectionUtils.getFragmentWithReplacement("/server/UpdateEntityState.java", updateCases);