diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index 2eb39311..e754ea1e 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -5,6 +5,7 @@ using ReallifeGamemode.Server.Factions.Medic;
 using ReallifeGamemode.Server.Models;
 using ReallifeGamemode.Server.Services;
 using ReallifeGamemode.Server.Wanted;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
@@ -247,15 +248,9 @@ namespace ReallifeGamemode.Server.Commands
           ChatService.ErrorMessage(player, "Der Spieler hat keine Wanteds");
           return;
         }
-        ChatService.SendMessage(target, "Deine Akte wurde von "+ player.Name + " gelöscht. Grund:" + reason);
-        foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
-        {
-          User copUser = copPlayer.GetUser();
-          if ((copUser.FactionId == 1 || copUser.FactionId == 3))
-          {
-            ChatService.SendMessage(copPlayer, "~r~HQ: Die Akte von " + user.Name + " wurde von "+ player.Name +" gelöscht. Grund: " + reason + ".");
-          }
-        }
+        ChatService.SendMessage(target, "Deine Akte wurde von "+ player.Name + " gelöscht. Grund:" + reason);      
+        ChatService.BroadcastFaction("~r~HQ: Die Akte von " + user.Name + " wurde von "+ player.Name +" gelöscht. Grund: " + reason + ".", new List<int>(){1, 3});
+
         targetUser.Wanteds = 0;
         dbContext.SaveChanges();
       }
@@ -291,14 +286,8 @@ namespace ReallifeGamemode.Server.Commands
         {
           Jail.Release_Jail(target, reason);
           ChatService.SendMessage(target, "~r~Du wurdest von "+ player.Name +" aus dem Knast befreit");
-          foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
-          {
-            User copUser = copPlayer.GetUser();
-            if ((copUser.FactionId == 1 || copUser.FactionId == 3))
-            {
-              ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " wurde von " + player.Name + " aus dem Knast entlassen. Grund: " + reason + ".");
-            }
-          }
+        
+          ChatService.BroadcastFaction("~r~HQ: " + user.Name + " wurde von " + player.Name + " aus dem Knast entlassen. Grund: " + reason + ".", new List<int>() { 1, 3 });
         }
         else
         {
diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index 97579d4b..be36f4df 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -106,7 +106,7 @@ namespace ReallifeGamemode.Server.Extensions
       foreach(var copPlayer in NAPI.Pools.GetAllPlayers())
       {
         User copUser = copPlayer.GetUser();
-        if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop != null)
+        if(cop != null && (copUser.FactionId == 1 || copUser.FactionId == 3))
         {
           ChatService.SendMessage(copPlayer, "~r~HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel "+ amount +". Straftäter: "+ user.Name + ".");
           ChatService.SendMessage(copPlayer, "~r~HQ: Grund: " + reason + ".");
diff --git a/ReallifeGamemode.Server/Services/ChatService.cs b/ReallifeGamemode.Server/Services/ChatService.cs
index 7712d604..e8919b3b 100644
--- a/ReallifeGamemode.Server/Services/ChatService.cs
+++ b/ReallifeGamemode.Server/Services/ChatService.cs
@@ -3,6 +3,7 @@ using ReallifeGamemode.Server.Entities;
 using ReallifeGamemode.Server.Extensions;
 using ReallifeGamemode.Server.Job;
 using ReallifeGamemode.Server.Util;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -103,5 +104,10 @@ namespace ReallifeGamemode.Server.Services
     {
       job.GetUsersInJob().ForEach(c => ChatService.SendMessage(c, message));
     }
+
+    internal static void BroadcastFaction(string v, List<int> list)
+    {
+      throw new NotImplementedException();
+    }
   }
 }
diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs
index 8bff1474..4ae2c404 100644
--- a/ReallifeGamemode.Server/Wanted/Jail.cs
+++ b/ReallifeGamemode.Server/Wanted/Jail.cs
@@ -74,14 +74,8 @@ namespace ReallifeGamemode.Server.Wanted
             Medic.RemoveTaskFromList(task);
             client.Health = 100;
 
-            foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
-            {
-              User copUser = copPlayer.GetUser();
-              if ((copUser.FactionId == 1 || copUser.FactionId == 3))
-              {
-                ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " wurde im Gefängnis zugewiesen.");
-              }
-            }
+          
+            ChatService.BroadcastFaction("~r~HQ: " + user.Name + " wurde im Gefängnis zugewiesen.", new List<int>() {1,3});
            
             ChatService.SendMessage(client, "Du bist im Gefängnis für " + user.JailTime + " Sekunden.");