diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini
index 5ed46241..d07ed6a3 100644
--- a/resources/DefaultInput.ini
+++ b/resources/DefaultInput.ini
@@ -21,4 +21,5 @@ F1=ToggleEditor
 X=EditorToggleTransformSpace
 C=ConnectToServer
 N=SwitchToServer
-M=SwitchToClient
\ No newline at end of file
+M=SwitchToClient
+P=SwitchToPlayer
\ No newline at end of file
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index 387961ef..2a4f531e 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -310,9 +310,9 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
 
 bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
 {
-    Packet packet(MessageType::OnInputCommand, m_SendPacketID);
+    Packet packet(MessageType::OnPlayerDamage, m_SendPacketID);
     packet.WritePrimitive(e.DamageAmount);
-    packet.WritePrimitive(e.PlayerDamagedID);
+    packet.WritePrimitive(m_ClientIDToServerID.at(e.PlayerDamagedID));
     send(packet);
     return false;
 }
diff --git a/src/Game/Systems/HealthSystem.cpp b/src/Game/Systems/HealthSystem.cpp
index 5e5be33e..4190e04f 100644
--- a/src/Game/Systems/HealthSystem.cpp
+++ b/src/Game/Systems/HealthSystem.cpp
@@ -12,7 +12,6 @@ HealthSystem::HealthSystem(World* m_World, EventBroker* eventBroker)
 void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt)
 {
     //if entityID of health is 9 then the players ID is also 9 (player,health are connected to the same entity)
-    ComponentWrapper player = m_World->GetComponent(component.EntityID, "Player");
     double maxHealth = (double)component["MaxHealth"];
 
     //process the DeltaHealthVector and change the entitys health accordingly
diff --git a/src/Game/Systems/WeaponSystem.cpp b/src/Game/Systems/WeaponSystem.cpp
index 11f76490..da5b057b 100644
--- a/src/Game/Systems/WeaponSystem.cpp
+++ b/src/Game/Systems/WeaponSystem.cpp
@@ -22,8 +22,8 @@ void WeaponSystem::Update(double dt)
             continue;
         }
         //if its a player, do PlayerDamage event
-        const bool hasPlayerComponent = m_World->HasComponent(pickDataFromShot.Entity, "Player");
-        if (hasPlayerComponent) {
+        const bool hasHealthComponent = m_World->HasComponent(pickDataFromShot.Entity, "Health");
+        if (hasHealthComponent) {
             Events::PlayerDamage ePlayerDamage;
             //TODO: damage based on weapontype/class?
             //TODO: multiple shots at the same time? (shotgunner)