diff --git a/assets/bombs/explosion/blast.png b/assets/bombs/explosion/blast.png
new file mode 100644
index 00000000..037212f6
Binary files /dev/null and b/assets/bombs/explosion/blast.png differ
diff --git a/assets/bombs/explosion/explosion.glb b/assets/bombs/explosion/explosion.glb
new file mode 100644
index 00000000..065ed85c
Binary files /dev/null and b/assets/bombs/explosion/explosion.glb differ
diff --git a/sources/Map/Map.cpp b/sources/Map/Map.cpp
index 90de3fec..db57c953 100644
--- a/sources/Map/Map.cpp
+++ b/sources/Map/Map.cpp
@@ -134,9 +134,25 @@ namespace BBM
 		static const std::string unbreakableObj = unbreakableWallPath + objExtension;
 		static const std::string unbreakablePnj = unbreakableWallPath + imageExtension;
 
+		for (int i = 0; i < height; i++) {
+			scene->addEntity("Bomb stopper")
+				.addComponent<PositionComponent>(-1, 0, i)
+				.addComponent<TagComponent<Blowable>>();
+			scene->addEntity("Bomb stopper")
+				.addComponent<PositionComponent>(width + 1, 0, i)
+				.addComponent<TagComponent<Blowable>>();
+		}
+		for (int i = 0; i < width; i++) {
+			scene->addEntity("Bomb stopper")
+				.addComponent<PositionComponent>(i, 0, -1)
+				.addComponent<TagComponent<Blowable>>();
+			scene->addEntity("Bomb stopper")
+				.addComponent<PositionComponent>(i, 0, height + 1)
+				.addComponent<TagComponent<Blowable>>();
+		}
+
 		scene->addEntity("Bottom Wall")
 			.addComponent<PositionComponent>(Vector3f((width + 1) / 2, 0, -1))
-			.addComponent<TagComponent<Blowable>>()
 			.addComponent<CollisionComponent>(
 				WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
 				&MapGenerator::wallCollided, Vector3f(-(width + 1) / 2 , 0.25, 0.25), Vector3f(width + 1, 2, 0.75))
@@ -145,7 +161,6 @@ namespace BBM
 			                                                 RAY::Vector3(width + 3, 1, 1));
 		scene->addEntity("Upper Wall")
 			.addComponent<PositionComponent>(Vector3f((width + 1) / 2, 0, height + 1))
-			.addComponent<TagComponent<Blowable>>()
 			.addComponent<CollisionComponent>(
 				WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
 				&MapGenerator::wallCollided, Vector3f(-(width + 1) / 2 , 0.25, 0.25), Vector3f(width + 1, 2, 0.75))
@@ -154,7 +169,6 @@ namespace BBM
 			                                                 RAY::Vector3(width + 3, 1, 1));
 		scene->addEntity("Left Wall")
 			.addComponent<PositionComponent>(Vector3f(width + 1, 0, height / 2))
-			.addComponent<TagComponent<Blowable>>()
 			.addComponent<CollisionComponent>(
 				WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
 				&MapGenerator::wallCollided, Vector3f(0.25, 0.25, -(height + 1) / 2 ), Vector3f(0.75, 2, height + 1))
diff --git a/sources/System/BombHolder/BombHolderSystem.cpp b/sources/System/BombHolder/BombHolderSystem.cpp
index a6993e36..1cae7500 100644
--- a/sources/System/BombHolder/BombHolderSystem.cpp
+++ b/sources/System/BombHolder/BombHolderSystem.cpp
@@ -2,6 +2,7 @@
 // Created by Zoe Roux on 5/31/21.
 //
 
+#include <Component/Animation/AnimationsComponent.hpp>
 #include <Component/Bomb/BasicBombComponent.hpp>
 #include "Component/Timer/TimerComponent.hpp"
 #include "System/Event/EventSystem.hpp"
@@ -38,7 +39,14 @@ namespace BBM
 	{
 		if (radiusToDo <= 0)
 			return;
-		wal.getSystem<EventSystem>().dispatchEvent([position, radiusToDo, posFrom](WAL::Wal &wal) {
+		wal.getScene()->scheduleNewEntity("explosion")
+			.addComponent<PositionComponent>(position)
+			.addComponent<TimerComponent>(1s, [](WAL::Entity &explosion, WAL::Wal &wal) {
+				explosion.scheduleDeletion();
+			})
+			.addComponent<Drawable3DComponent, RAY3D::Model>("assets/bombs/explosion/explosion.glb", false,
+															 std::make_pair(MAP_DIFFUSE, "assets/bombs/explosion/blast.png"));
+		wal.getSystem<EventSystem>().dispatchEvent([position, count](WAL::Wal &wal) {
 			for (auto &[entity, pos, _] : wal.getScene()->view<PositionComponent, TagComponent<Blowable>>()) {
 				if (pos.position.round() == position) {
 					if (auto *health = entity.tryGetComponent<HealthComponent>())
diff --git a/sources/System/Gamepad/GamepadSystem.cpp b/sources/System/Gamepad/GamepadSystem.cpp
index ee4b8767..5dd30a34 100644
--- a/sources/System/Gamepad/GamepadSystem.cpp
+++ b/sources/System/Gamepad/GamepadSystem.cpp
@@ -33,9 +33,9 @@ namespace BBM
 			key.second = gamepad.isPressed(key.first);
 		controllable.move.x = gamepad.getAxisValue(gamepadComponent.LeftStickX) * -1;
 		controllable.move.y = gamepad.getAxisValue(gamepadComponent.LeftStickY) * -1;
-		controllable.move.x -= gamepad.isDown(gamepadComponent.keyRight);
-		controllable.move.x += gamepad.isDown(gamepadComponent.keyLeft);
-		controllable.move.y += gamepad.isDown(gamepadComponent.keyUp);
-		controllable.move.y -= gamepad.isDown(gamepadComponent.keyDown);
+		controllable.move.x -= static_cast<float>(gamepad.isDown(gamepadComponent.keyRight));
+		controllable.move.x += static_cast<float>(gamepad.isDown(gamepadComponent.keyLeft));
+		controllable.move.y += static_cast<float>(gamepad.isDown(gamepadComponent.keyUp));
+		controllable.move.y -= static_cast<float>(gamepad.isDown(gamepadComponent.keyDown));
 	}
 }
\ No newline at end of file