diff --git a/include/Engine/Collision/Collision.h b/include/Engine/Collision/Collision.h
index c4292907..c3759393 100644
--- a/include/Engine/Collision/Collision.h
+++ b/include/Engine/Collision/Collision.h
@@ -79,7 +79,8 @@ bool AABBVsAABB(const AABB& a, const AABB& b);
 bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
 
 // Calculates an absolute AABB from an entity AABB component
-boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity);
+boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox = false);
+boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity);
 
 }
 
diff --git a/include/Engine/Core/Util/IfDebug.h b/include/Engine/Core/Util/IfDebug.h
index 79cb3a4c..85b64c8d 100644
--- a/include/Engine/Core/Util/IfDebug.h
+++ b/include/Engine/Core/Util/IfDebug.h
@@ -4,7 +4,7 @@
 // }
 // NOTE: condition statement is not executed at all in release mode.
 #ifndef DEBUG_IF
-#ifndef DEBUG
+#ifdef DEBUG
 #define DEBUG_IF(c) if(c)
 #else
 #define DEBUG_IF(c) if(false)
diff --git a/resources/Schema/Components/Collidable.xsd b/resources/Schema/Components/Collidable.xsd
index 84c66f11..93f7ac24 100644
--- a/resources/Schema/Components/Collidable.xsd
+++ b/resources/Schema/Components/Collidable.xsd
@@ -4,5 +4,8 @@
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 
 	<xs:element name="Collidable">
+		<xs:annotation>
+			<xs:documentation>Needs a Model or AABB component to work, uses AABB if both are attached.</xs:documentation>
+		</xs:annotation>
 	</xs:element>
 </xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Components/Trigger.xsd b/resources/Schema/Components/Trigger.xsd
index a8bc8865..8119b966 100644
--- a/resources/Schema/Components/Trigger.xsd
+++ b/resources/Schema/Components/Trigger.xsd
@@ -4,5 +4,8 @@
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
 
 	<xs:element name="Trigger">
+		<xs:annotation>
+			<xs:documentation>Needs a Model or AABB component to work, uses AABB if both are attached.</xs:documentation>
+		</xs:annotation>
 	</xs:element>
 </xs:schema>
\ No newline at end of file
diff --git a/src/Engine/Collision/Collision.cpp b/src/Engine/Collision/Collision.cpp
index 249669b9..b7b21969 100644
--- a/src/Engine/Collision/Collision.cpp
+++ b/src/Engine/Collision/Collision.cpp
@@ -565,10 +565,10 @@ bool AABBvsTriangles(const AABB& box,
     return hit;
 }
 
-boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity)
+boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox)
 {
     AABB modelSpaceBox;
-    if (entity.HasComponent("AABB")) {
+    if (entity.HasComponent("AABB") && !takeModelBox) {
         ComponentWrapper& cAABB = entity["AABB"];
         modelSpaceBox = EntityAABB::FromOriginSize((glm::vec3)cAABB["Origin"], (glm::vec3)cAABB["Size"]);
     } else if (entity.HasComponent("Model")) {
@@ -612,4 +612,30 @@ boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity)
     return aabb;
 }
 
+boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity)
+{
+    boost::optional<EntityAABB> modelBox = EntityAbsoluteAABB(entity, true);
+    if (!modelBox) {
+        return boost::none;
+    }
+    bool isRandom = (bool)entity["ExplosionEffect"]["Randomness"];
+    float random = isRandom ? (float)(double)entity["ExplosionEffect"]["RandomnessScalar"] : 0;
+    glm::vec3 origin = (glm::vec3)entity["ExplosionEffect"]["ExplosionOrigin"];
+    glm::vec3 randomVel = (glm::vec3)entity["ExplosionEffect"]["Velocity"];
+    randomVel *= (random + 1);
+    float endVelocity = randomVel.y;
+    if ((bool)entity["ExplosionEffect"]["ExponentialAccelaration"]) {
+        endVelocity *= endVelocity / 2.f;
+    }
+    float maxRadius = (float)(double)entity["ExplosionEffect"]["ExplosionDuration"] * endVelocity;
+    glm::vec3 size;
+    AABB explosionBox(origin - (size / 2.f), origin + (size / 2.f));
+
+    glm::vec3 mini = glm::min(explosionBox.MinCorner(), (*modelBox).MinCorner());
+    glm::vec3 maxi = glm::max(explosionBox.MaxCorner(), (*modelBox).MaxCorner());
+    EntityAABB aabb = AABB(mini, maxi);
+    aabb.Entity = entity;
+    return aabb;
+}
+
 }
\ No newline at end of file
diff --git a/src/Engine/Collision/FillFrustumOctreeSystem.cpp b/src/Engine/Collision/FillFrustumOctreeSystem.cpp
index f02a30f1..2be8bee0 100644
--- a/src/Engine/Collision/FillFrustumOctreeSystem.cpp
+++ b/src/Engine/Collision/FillFrustumOctreeSystem.cpp
@@ -7,15 +7,13 @@ void FillFrustumOctreeSystem::Update(double dt)
 
 void FillFrustumOctreeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
+    boost::optional<EntityAABB> absoluteAABB;
     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);
+        absoluteAABB = Collision::AbsoluteAABBExplosionEffect(entity);
     } else {
-        boost::optional<EntityAABB> absoluteAABB = Collision::EntityAbsoluteAABB(entity);
-        if (absoluteAABB) {
-            m_Octree->AddDynamicObject(*absoluteAABB);
-        }
+        absoluteAABB = Collision::EntityAbsoluteAABB(entity, true);
     }
-}
\ No newline at end of file
+    if (absoluteAABB) {
+        m_Octree->AddDynamicObject(*absoluteAABB);
+    }
+}
diff --git a/src/Engine/Rendering/Model.cpp b/src/Engine/Rendering/Model.cpp
index 6457c980..0c3d7877 100644
--- a/src/Engine/Rendering/Model.cpp
+++ b/src/Engine/Rendering/Model.cpp
@@ -135,7 +135,7 @@ Model::Model(std::string fileName)
         maxi = glm::max(maxi, v.Position);
     }
 
-    m_Box = AABB(maxi, mini);
+    m_Box = AABB(mini, maxi);
 }
 
 Model::~Model()