diff --git a/include/Game/Game.h b/include/Game/Game.h
index dfe1cff6..6614957f 100644
--- a/include/Game/Game.h
+++ b/include/Game/Game.h
@@ -20,7 +20,7 @@
 #include "Core/EntityFile.h"
 #include "Rendering/RenderSystem.h"
 #include "Core/EntityFileParser.h"
-
+#include "InterpolationSystem.h"
 // Network
 #include <boost/thread.hpp>
 #include "Network/Network.h"
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index 38eaf235..a063e207 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -33,6 +33,7 @@ void Client::Start(World* world, EventBroker* eventBroker)
 
 void Client::Update()
 {
+    m_EventBroker->Process<Client>();
     readFromServer();
 }
 
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index ba660a7d..7ccd7fac 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -66,6 +66,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<PlayerSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<EditorSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<HealthSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<InterpolationSystem>(updateOrderLevel);
 
     //Collision and TriggerSystem should update after player.
     ++updateOrderLevel;
@@ -119,7 +120,6 @@ void Game::Tick()
     // Iterate through systems and update world!
     m_SystemPipeline->Update(m_World, dt);
     m_Renderer->Update(dt);
-    m_EventBroker->Process<Client>();
 
     GLERROR("Game::Tick m_RenderQueueFactory->Update");
     m_Renderer->Draw(*m_RenderFrame);