diff --git a/src/main/java/electrosphere/controls/ControlHandler.java b/src/main/java/electrosphere/controls/ControlHandler.java
index 9b51f9da..9495c6eb 100644
--- a/src/main/java/electrosphere/controls/ControlHandler.java
+++ b/src/main/java/electrosphere/controls/ControlHandler.java
@@ -499,7 +499,7 @@ public class ControlHandler {
                 controls.get(DATA_STRING_INPUT_CODE_DEBUG_SPAWN_ITEM).setState(true);
             } else {
                 if(controls.get(DATA_STRING_INPUT_CODE_DEBUG_SPAWN_ITEM).isState() == true){
-                    Entity bow = ItemUtils.spawnBasicItem("Bow");
+                    Entity bow = ItemUtils.spawnBasicItem("Katana");
                     EntityUtils.getPosition(bow).set(1, 5, 2);
                     CollisionObjUtils.positionCharacter(bow, new Vector3f(1, 5, 2));
                 }
diff --git a/src/main/java/electrosphere/engine/LoadingThread.java b/src/main/java/electrosphere/engine/LoadingThread.java
index 74544cd2..5e1dab15 100644
--- a/src/main/java/electrosphere/engine/LoadingThread.java
+++ b/src/main/java/electrosphere/engine/LoadingThread.java
@@ -620,8 +620,8 @@ public class LoadingThread extends Thread {
 //        //give evil goblin sword
 //        Entity goblinSword = ItemUtils.spawnBasicItem("Katana");
 //        AttachUtils.attachEntityToEntityAtBone(goblin, goblinSword, "Bone.031");
-//        //attach ai to evil goblin
-//        MindlessAttacker.attachToCreature(goblin);
+        //attach ai to evil goblin
+        MindlessAttacker.attachToCreature(goblin);
         
 //        goblin = CreatureUtils.spawnBasicCreature("Goblin");
 //        CollisionObjUtils.positionCharacter(goblin, new Vector3f(3, 0, 4));
diff --git a/src/main/java/electrosphere/entity/EntityManager.java b/src/main/java/electrosphere/entity/EntityManager.java
index c4c05207..6aa17312 100644
--- a/src/main/java/electrosphere/entity/EntityManager.java
+++ b/src/main/java/electrosphere/entity/EntityManager.java
@@ -282,4 +282,13 @@ public class EntityManager {
         }
     }
     
+    
+    public void setTargetable(Entity target, boolean status){
+        if(status){
+            targetableList.add(target);
+        } else {
+            targetableList.remove(target);
+        }
+    }
+    
 }
diff --git a/src/main/java/electrosphere/entity/state/equip/EquipState.java b/src/main/java/electrosphere/entity/state/equip/EquipState.java
index 4bc8b66b..8cfa0d80 100644
--- a/src/main/java/electrosphere/entity/state/equip/EquipState.java
+++ b/src/main/java/electrosphere/entity/state/equip/EquipState.java
@@ -47,7 +47,7 @@ public class EquipState {
                 CollisionObject rigidBody = (CollisionObject)toEquip.getData(EntityDataStrings.PHYSICS_COLLISION_BODY);
                 Globals.collisionEngine.deregisterPhysicsObject(rigidBody);
             }
-            Crosshair.setTargetable(equipPrimary, false);
+            Globals.entityManager.setTargetable(equipPrimary, false);
         }
     }
     
@@ -58,7 +58,7 @@ public class EquipState {
                 CollisionObject rigidBody = (CollisionObject)equipPrimary.getData(EntityDataStrings.PHYSICS_COLLISION_BODY);
                 Globals.collisionEngine.registerPhysicsObject(rigidBody);
             }
-            Crosshair.setTargetable(equipPrimary, true);
+            Globals.entityManager.setTargetable(equipPrimary, true);
             equipPrimary = null;
         }
     }
diff --git a/src/main/java/electrosphere/game/client/targeting/crosshair/Crosshair.java b/src/main/java/electrosphere/game/client/targeting/crosshair/Crosshair.java
index 2e8c2038..ba21f588 100644
--- a/src/main/java/electrosphere/game/client/targeting/crosshair/Crosshair.java
+++ b/src/main/java/electrosphere/game/client/targeting/crosshair/Crosshair.java
@@ -98,13 +98,4 @@ public class Crosshair {
         return currentTarget;
     }
     
-    public static void setTargetable(Entity target, boolean status){
-        if(status){
-            Globals.entityManager.getTargetables().add(target);
-        } else {
-            Globals.entityManager.getTargetables().remove(target);
-        }
-    }
-    
-    
 }