diff --git a/include/game/World.h b/include/game/World.h
index 395404d..ca3a65c 100644
--- a/include/game/World.h
+++ b/include/game/World.h
@@ -120,6 +120,9 @@ class WorldListener {
 public:
     WorldListener() {}
 
+    virtual void OnTowerAdd(TowerPtr tower) {}
+    virtual void OnTowerRemove(TowerPtr tower) {}
+
     virtual void OnArcherTowerShot(MobPtr target, ArcherTower* shooter) {}
 
     virtual void OnArrowShot(MobPtr target, bool fire, Tower* shooter) {}
diff --git a/include/game/client/ClientGame.h b/include/game/client/ClientGame.h
index 8806c9e..cb11294 100644
--- a/include/game/client/ClientGame.h
+++ b/include/game/client/ClientGame.h
@@ -37,6 +37,7 @@ public:
     Client* getClient() const { return m_Client; }
 
     render::Renderer* getRenderer() const { return m_Renderer; }
+    WorldClient& getWorld() { return m_WorldClient; }
 
     virtual void HandlePacket(const protocol::ConnexionInfoPacket* packet);
     virtual void HandlePacket(const protocol::PlayerJoinPacket* packet);
@@ -48,7 +49,7 @@ public:
     virtual void HandlePacket(const protocol::UpdateMoneyPacket* packet);
     virtual void HandlePacket(const protocol::DisconnectPacket* packet);
     virtual void HandlePacket(const protocol::WorldDataPacket* packet);
-    virtual void HandlePacket(const protocol::WorldAddTowerPacket* packet);
+
 };
 
 } // namespace client
diff --git a/include/game/client/WorldClient.h b/include/game/client/WorldClient.h
index fd6ae9b..2880ccb 100644
--- a/include/game/client/WorldClient.h
+++ b/include/game/client/WorldClient.h
@@ -14,10 +14,11 @@ private:
 public:
     WorldClient(ClientGame* game);
 
-    virtual void HandlePacket(const protocol::WorldBeginDataPacket* packet) override;
-    virtual void HandlePacket(const protocol::WorldDataPacket* packet) override;
-    virtual void HandlePacket(const protocol::SpawnMobPacket* packet) override;
-    virtual void HandlePacket(const protocol::UpgradeTowerPacket* packet) override;
+    virtual void HandlePacket(const protocol::WorldBeginDataPacket* packet);
+    virtual void HandlePacket(const protocol::WorldDataPacket* packet);
+    virtual void HandlePacket(const protocol::SpawnMobPacket* packet);
+    virtual void HandlePacket(const protocol::UpgradeTowerPacket* packet);
+    virtual void HandlePacket(const protocol::WorldAddTowerPacket* packet);
 
 };
 
diff --git a/include/render/WorldRenderer.h b/include/render/WorldRenderer.h
index ba918ec..474a836 100644
--- a/include/render/WorldRenderer.h
+++ b/include/render/WorldRenderer.h
@@ -23,7 +23,7 @@ class ClientGame;
 
 namespace render {
 
-class WorldRenderer {
+class WorldRenderer : public game::WorldListener {
 private:
     client::ClientGame* m_Client;
     Renderer* m_Renderer;
@@ -58,6 +58,11 @@ public:
 
     void moveCam(float relativeX, float relativeY, float aspectRatio);
     void changeZoom(float zoom);
+
+    // WorldListener
+
+    virtual void OnTowerAdd(game::TowerPtr tower);
+    virtual void OnTowerRemove(game::TowerPtr tower);
 private:
     void click();
     void renderWorld() const;
diff --git a/src/game/client/ClientGame.cpp b/src/game/client/ClientGame.cpp
index 8889ffb..c2fe69e 100644
--- a/src/game/client/ClientGame.cpp
+++ b/src/game/client/ClientGame.cpp
@@ -112,9 +112,5 @@ void ClientGame::renderWorld() {
     }
 }
 
-void ClientGame::HandlePacket(const protocol::WorldAddTowerPacket* packet) {
-    m_WorldRenderer.addTower(m_WorldClient.placeTowerAt(packet->getTowerID(), packet->getTowerType(), packet->getTowerX(), packet->getTowerY(), packet->getBuilder()));
-}
-
 } // namespace client
 } // namespace td
diff --git a/src/game/client/WorldClient.cpp b/src/game/client/WorldClient.cpp
index bd2d7f4..32afb29 100644
--- a/src/game/client/WorldClient.cpp
+++ b/src/game/client/WorldClient.cpp
@@ -7,6 +7,7 @@ namespace td {
 namespace client {
 
 WorldClient::WorldClient(ClientGame* game) : game::World(game), protocol::PacketHandler(game->GetDispatcher()), m_Game(game) {
+    GetDispatcher()->RegisterHandler(protocol::PacketType::WorldAddTower, this);
     GetDispatcher()->RegisterHandler(protocol::PacketType::WorldBeginData, this);
     GetDispatcher()->RegisterHandler(protocol::PacketType::WorldData, this);
     GetDispatcher()->RegisterHandler(protocol::PacketType::SpawnMob, this);
@@ -32,5 +33,11 @@ void WorldClient::HandlePacket(const protocol::UpgradeTowerPacket* packet) {
     tower->upgrade(packet->getTowerLevel().getLevel(), packet->getTowerLevel().getPath());
 }
 
+void WorldClient::HandlePacket(const protocol::WorldAddTowerPacket* packet) {
+    game::TowerPtr newTower = placeTowerAt(packet->getTowerID(), packet->getTowerType(), packet->getTowerX(), packet->getTowerY(), packet->getBuilder());
+
+    notifyListeners(&WorldListener::OnTowerAdd, newTower);
+}
+
 } // namespace client
 } // namespace td
diff --git a/src/game/server/ServerConnexion.cpp b/src/game/server/ServerConnexion.cpp
index b5e1b87..54812fb 100644
--- a/src/game/server/ServerConnexion.cpp
+++ b/src/game/server/ServerConnexion.cpp
@@ -159,6 +159,8 @@ void ServerConnexion::HandlePacket(const protocol::PlaceTowerPacket* packet) {
 
     game::TowerPtr tower = world->placeTowerAt(towerType, packet->getTowerX(), packet->getTowerY(), m_ID);
 
+    world->notifyListeners(&game::WorldListener::OnTowerAdd, tower);
+
     protocol::WorldAddTowerPacket addTowerPacket(tower->getID(), packet->getTowerX(), packet->getTowerY(), packet->getTowerType(), m_ID);
     m_Server->broadcastPacket(&addTowerPacket);
 }
diff --git a/src/render/WorldRenderer.cpp b/src/render/WorldRenderer.cpp
index 42da75e..4536492 100644
--- a/src/render/WorldRenderer.cpp
+++ b/src/render/WorldRenderer.cpp
@@ -37,6 +37,7 @@ WorldRenderer::WorldRenderer(game::World* world, client::ClientGame* client) : m
     m_Renderer->setCamMovement({});
     m_TowerPlacePopup = std::make_unique<gui::TowerPlacePopup>(m_Client->getClient());
     m_MobTooltip = std::make_unique<gui::MobTooltip>(m_Client->getClient());
+    m_Client->getWorld().bindListener(this);
 }
 
 void WorldRenderer::updateCursorPos() {
@@ -235,7 +236,7 @@ void WorldRenderer::renderMobTooltip() const {
 void WorldRenderer::detectMobHovering() const {
     glm::vec2 cursorWorldPos = getCursorWorldPos();
     for (game::MobPtr mob : m_World->getMobList()) {
-        if(mob->collidesWith({cursorWorldPos.x, cursorWorldPos.y})){
+        if (mob->collidesWith({ cursorWorldPos.x, cursorWorldPos.y })) {
             m_MobTooltip->setMob(mob.get());
             return;
         }
@@ -243,13 +244,13 @@ void WorldRenderer::detectMobHovering() const {
     m_MobTooltip->setMob(nullptr);
 }
 
-void WorldRenderer::addTower(game::TowerPtr tower) {
-    const WorldLoader::RenderData& renderData = WorldLoader::loadTowerModel(tower);
+void WorldRenderer::OnTowerAdd(game::TowerPtr tower) {
+    WorldLoader::RenderData renderData = WorldLoader::loadTowerModel(tower);
     m_TowersCache.addData(tower->getID(), renderData.positions, renderData.colors);
     m_TowersCache.updateVertexArray();
 }
 
-void WorldRenderer::removeTower(game::TowerPtr tower) {
+void WorldRenderer::OnTowerRemove(game::TowerPtr tower) {
     m_TowersCache.removeData(tower->getID());
     m_TowersCache.updateVertexArray();
 }