diff --git a/include/Engine/Collision/FillFrustumOctreeSystem.h b/include/Engine/Collision/FillFrustumOctreeSystem.h
new file mode 100644
index 00000000..f7f1413c
--- /dev/null
+++ b/include/Engine/Collision/FillFrustumOctreeSystem.h
@@ -0,0 +1,25 @@
+#ifndef FillFrustumOctreeSystem_h__
+#define FillFrustumOctreeSystem_h__
+
+#include "../Core/System.h"
+#include "../Core/Octree.h"
+#include "Collision.h"
+#include "EntityAABB.h"
+
+class FillFrustumOctreeSystem : public ImpureSystem, public PureSystem
+{
+public:
+    FillFrustumOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
+        : System(world, eventBroker)
+        , PureSystem("Model")
+        , m_Octree(octree)
+    { }
+
+    virtual void Update(double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
+
+private:
+    Octree<EntityAABB>* m_Octree;
+};
+
+#endif
\ No newline at end of file
diff --git a/include/Engine/Collision/FillOctreeSystem.h b/include/Engine/Collision/FillOctreeSystem.h
index 9fd87b94..3bacccac 100644
--- a/include/Engine/Collision/FillOctreeSystem.h
+++ b/include/Engine/Collision/FillOctreeSystem.h
@@ -1,5 +1,5 @@
-#ifndef CollidableOctreeSystem_h__
-#define CollidableOctreeSystem_h__
+#ifndef FillOctreeSystem_h__
+#define FillOctreeSystem_h__
 
 #include "../Core/System.h"
 #include "../Core/Octree.h"
diff --git a/src/Engine/Collision/FillFrustumOctreeSystem.cpp b/src/Engine/Collision/FillFrustumOctreeSystem.cpp
new file mode 100644
index 00000000..f02a30f1
--- /dev/null
+++ b/src/Engine/Collision/FillFrustumOctreeSystem.cpp
@@ -0,0 +1,21 @@
+#include "Collision/FillFrustumOctreeSystem.h"
+
+void FillFrustumOctreeSystem::Update(double dt)
+{
+    m_Octree->ClearDynamicObjects();
+}
+
+void FillFrustumOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
+{
+    if (entity.HasComponent("ExplosionEffect")) {
+        //TODO: Fix hack, get real box by using shader equation.
+        EntityAABB aabb = AABB(glm::vec3(-300), glm::vec3(300));
+        aabb.Entity = entity;
+        m_Octree->AddDynamicObject(aabb);
+    } else {
+        boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
+        if (absoluteAABB) {
+            m_Octree->AddDynamicObject(*absoluteAABB);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index d32eb2ba..0f836c6f 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -1,5 +1,6 @@
 #include "Game.h"
 #include "Collision/FillOctreeSystem.h"
+#include "Collision/FillFrustumOctreeSystem.h"
 #include "Collision/EntityAABB.h"
 #include "Collision/TriggerSystem.h"
 #include "Collision/CollisionSystem.h"
@@ -101,7 +102,7 @@ Game::Game(int argc, char* argv[])
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
-    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling, "Model");
+    m_SystemPipeline->AddSystem<FillFrustumOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling);
     m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);