diff --git a/src/hacks/AutoHeal.cpp b/src/hacks/AutoHeal.cpp
index 9e7bcc8b..43d884bf 100644
--- a/src/hacks/AutoHeal.cpp
+++ b/src/hacks/AutoHeal.cpp
@@ -347,7 +347,7 @@ static CatCommand heal_steamid(
                 continue;
             if (ent->m_Type() != ENTITY_PLAYER)
                 continue;
-            if (ent->player_info.friendsID == strtol(args.Arg(1), nullptr, 10))
+            if (ent->player_info.friendsID == std::stoul(args.Arg(1)))
             {
                 force_healing_target = i;
                 return;
@@ -490,11 +490,14 @@ void CreateMove()
     }
 }
 
+std::array<Timer, 32> reset_cd{};
 std::vector<patient_data_s> data(32);
 void UpdateData()
 {
     for (int i = 1; i < 32; i++)
     {
+        if (reset_cd[i].test_and_set(10000))
+            data[i] = {};
         CachedEntity *ent = ENTITY(i);
         if (CE_GOOD(ent))
         {
@@ -511,6 +514,7 @@ void UpdateData()
             const int last_health = data[i].last_health;
             if (health != last_health)
             {
+                reset_cd[i].update();
                 data[i].last_health = health;
                 if (health < last_health)
                 {
diff --git a/src/irc.cpp b/src/irc.cpp
index c8f37932..4c56343e 100644
--- a/src/irc.cpp
+++ b/src/irc.cpp
@@ -18,6 +18,13 @@ static settings::Int port("irc.port", "8080");
 static settings::String commandandcontrol_channel("irc.cc.channel", "");
 static settings::String commandandcontrol_password("irc.cc.password", "");
 
+static settings::Bool irc_party{ "irc.cc.party", "false" };
+static settings::Bool answer_steam{ "irc.cc.respondparty", "false" };
+static settings::Int party_cooldown{ "irc.cc.party-cooldown", "60" };
+static Timer last_sent_steamid{};
+static Timer last_steamid_received{};
+static std::vector<unsigned> steamidvec{};
+
 static ChIRC::ChIRC irc;
 
 void printmsg(std::string &usr, std::string &msg)
@@ -111,6 +118,21 @@ void authreq(std::string &msg)
         }
     }
 }
+void cc_party(std::string &msg)
+{
+    if (msg.find("cc_partysteamrep") == 0)
+    {
+        if (!irc_party)
+            return;
+        unsigned steamid = std::stoul(msg.substr(16));
+        steamidvec.push_back(steamid);
+        last_steamid_received.update();
+    }
+    else if (answer_steam && msg.find("cc_partysteam") == 0)
+    {
+        irc.privmsg(format("cc_partysteamrep", g_ISteamUser->GetSteamID().GetAccountID()), true);
+    }
+}
 void cc_cmd(std::string &msg)
 {
     hack::ExecuteCommand(msg.substr(6));
@@ -156,6 +178,10 @@ void handleIRC(IRCMessage message, IRCClient *client)
             {
                 handlers::cc_cmd(msg);
             }
+            if (msg.find("cc_party") == 0)
+            {
+               handlers::cc_party(msg);
+            }
         }
     }
 }
@@ -209,7 +235,28 @@ static bool restarting{ false };
 
 static HookedFunction paint(HookedFunctions_types::HF_Paint, "IRC", 16, []() {
     if (!restarting)
+    {
+        if (!last_steamid_received.test_and_set(10000))
+        {
+            if (!steamidvec.empty())
+            {
+                steamidvec.push_back(g_ISteamUser->GetSteamID().GetAccountID());
+                int idx = -1;
+                unsigned lowest = UINT_MAX;
+                for (int i = 0; i < steamidvec.size(); i++)
+                    if (steamidvec[i] < lowest)
+                    {
+                        lowest = steamidvec[i];
+                        idx = i;
+                    }
+                if (idx != -1)
+                    hack::command_stack().push(format("tf_party_request_join_user ", steamidvec[idx]));
+            }
+        }
+        if (irc_party && last_sent_steamid.test_and_set(*party_cooldown * 1000))
+            irc.privmsg(format("cc_partysteam", g_ISteamUser->GetSteamID().GetAccountID()), true);
         irc.Update();
+    }
 });
 
 template <typename T> void rvarCallback(settings::VariableBase<T> &var, T after)