diff --git a/Engine/Board.py b/Engine/Board.py
index 23a03a79..d837a6b0 100644
--- a/Engine/Board.py
+++ b/Engine/Board.py
@@ -1,5 +1,6 @@
 import pygame
 from Constants import ROWS, COLS, SQUARE_SIZE, GREEN, BLACK, WIDTH
+from Engine.Bomb import Bomb
 
 
 class Board:
@@ -31,3 +32,9 @@ class Board:
                 rect = image.get_rect()
                 rect.center = (key.getX() * SQUARE_SIZE + SQUARE_SIZE / 2, key.getY() * SQUARE_SIZE + SQUARE_SIZE / 2)
                 self.win.blit(image, rect)
+
+    def getBomb(self, point):
+        if point in self.bombMap:
+            return self.bombMap[point]
+        return Bomb(0,0,"")
+
diff --git a/Engine/Game.py b/Engine/Game.py
index c13d1f91..c91e31c8 100644
--- a/Engine/Game.py
+++ b/Engine/Game.py
@@ -24,6 +24,7 @@ class Game:
         self.goingDown = True
 
     def update(self):
+        self.agent.defuse(self.board.getBomb(self.agent.getPoint()))
         self.board.drawSquares(self.win)
         self.board.drawBombs()
         self.board.drawAgent(self.win, self.agent)
@@ -46,11 +47,15 @@ class Game:
         self.agent.point = point
 
     def randomizeObject(self):
-        for x in range(10):
+        i = 0
+        while i < 11:
             point = Point(random.randint(0, 7), random.randint(0, 7))
+            if(point.getX() == 0 and point.getY() == 0):
+                continue;
             if point not in self.board.bombMap:
                 object = self.pickObject(random.randint(0, 4))
                 self.board.bombMap[point] = object
+                i += 1
 
     def pickObject(self, rand):
         if rand == 0:
diff --git a/Engine/__pycache__/Agent.cpython-39.pyc b/Engine/__pycache__/Agent.cpython-39.pyc
index c0aafeca..2e269567 100644
Binary files a/Engine/__pycache__/Agent.cpython-39.pyc and b/Engine/__pycache__/Agent.cpython-39.pyc differ
diff --git a/Engine/__pycache__/Board.cpython-39.pyc b/Engine/__pycache__/Board.cpython-39.pyc
index 8e4e7298..28b46e8c 100644
Binary files a/Engine/__pycache__/Board.cpython-39.pyc and b/Engine/__pycache__/Board.cpython-39.pyc differ
diff --git a/Engine/__pycache__/Bomb.cpython-39.pyc b/Engine/__pycache__/Bomb.cpython-39.pyc
index 12cd0cf4..0d130736 100644
Binary files a/Engine/__pycache__/Bomb.cpython-39.pyc and b/Engine/__pycache__/Bomb.cpython-39.pyc differ
diff --git a/Engine/__pycache__/BombFactory.cpython-39.pyc b/Engine/__pycache__/BombFactory.cpython-39.pyc
index bf63668f..0a585e56 100644
Binary files a/Engine/__pycache__/BombFactory.cpython-39.pyc and b/Engine/__pycache__/BombFactory.cpython-39.pyc differ
diff --git a/Engine/__pycache__/Game.cpython-39.pyc b/Engine/__pycache__/Game.cpython-39.pyc
index 2c8596b3..148b0357 100644
Binary files a/Engine/__pycache__/Game.cpython-39.pyc and b/Engine/__pycache__/Game.cpython-39.pyc differ
diff --git a/Engine/__pycache__/Point.cpython-39.pyc b/Engine/__pycache__/Point.cpython-39.pyc
index f9f42ce2..4fbbc370 100644
Binary files a/Engine/__pycache__/Point.cpython-39.pyc and b/Engine/__pycache__/Point.cpython-39.pyc differ
diff --git a/Engine/__pycache__/Stone.cpython-39.pyc b/Engine/__pycache__/Stone.cpython-39.pyc
index fa76839b..1a7586bb 100644
Binary files a/Engine/__pycache__/Stone.cpython-39.pyc and b/Engine/__pycache__/Stone.cpython-39.pyc differ
diff --git a/__pycache__/Constants.cpython-39.pyc b/__pycache__/Constants.cpython-39.pyc
index 941bb29f..467665c4 100644
Binary files a/__pycache__/Constants.cpython-39.pyc and b/__pycache__/Constants.cpython-39.pyc differ