diff --git a/VERSION b/VERSION
index c7b54bbb..b062a42a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.231.6
+2.1.231.7
diff --git a/config/config.json.example b/config/config.json.example
index f6139893..b7988de1 100644
--- a/config/config.json.example
+++ b/config/config.json.example
@@ -1,5 +1,5 @@
 {
-  "VERSION":"2.1.231.6",
+  "VERSION":"2.1.231.7",
   "DB_HOST":"localhost",
   "DB_NAME":"your_database_name",
   "DB_USER":"your_database_user",
diff --git a/logic/alarm.php b/logic/alarm.php
index 5505afd2..c13f1641 100644
--- a/logic/alarm.php
+++ b/logic/alarm.php
@@ -1,12 +1,14 @@
 <?php
 /**
  * Send raid alerts to user.
- * @param $raid_id_array - raid id or the result of get_raid()
- * @param $user_id - ID of the user that executed the call
- * @param $action - which alarm action to perform
- * @param $info - additional info for the action if required
+ * @param array $raid_id_array raid id or the result of get_raid()
+ * @param int $user_id ID of the user that executed the call
+ * @param string $action which alarm action to perform
+ * @param string $info additional info for the action if required
+ * @param array $tg_json multicurl array
+ * @return array multicurl array
  */
-function alarm($raid_id_array, $user_id, $action, $info = '')
+function alarm($raid_id_array, $user_id, $action, $info = '', $tg_json = [])
 {
     // Get config
     global $config;
@@ -65,7 +67,7 @@ function alarm($raid_id_array, $user_id, $action, $info = '')
                                 AND alarm = 1
                             ");
     }
-    $tg_json = [];
+
     while($answer = $request->fetch())
     {
         if(!isset($answer['lang']) or empty($answer['lang'])) $recipient_language = $config->LANGUAGE_PUBLIC;
@@ -255,7 +257,7 @@ function alarm($raid_id_array, $user_id, $action, $info = '')
         }
         $tg_json[] = send_message($answer['user_id'], $msg_text, false, false, true);
     }
-    if(count($tg_json) > 0) curl_json_multi_request($tg_json);
+    return $tg_json;
 }
 
 /**
diff --git a/mods/code.php b/mods/code.php
index 5d09ed6b..407905e2 100644
--- a/mods/code.php
+++ b/mods/code.php
@@ -16,6 +16,9 @@
 // Set the arg.
 $arg = $data['arg'];
 
+// Telegram JSON array.
+$tg_json = array();
+
 // Get raid info.
 $raid = get_raid($raid_id);
 $gym_name = $raid['gym_name'];
@@ -39,7 +42,7 @@
         $group_code = getTranslation('start_raid_public') . SP . getTranslation('no_group_code');
 
         // Send code via alarm function
-        alarm($raid_id,$update['callback_query']['from']['id'],'group_code_public',$group_code);
+        $tg_json = alarm($raid_id,$update['callback_query']['from']['id'],'group_code_public',$group_code, $tg_json);
 
         // Init empty keys array.
         $keys = [];
@@ -127,7 +130,7 @@
         $group_code .= $p3 . CR;
 
         // Send code via alarm function
-        alarm($raid_id,$update['callback_query']['from']['id'],'group_code_private',$group_code);
+        $tg_json = alarm($raid_id,$update['callback_query']['from']['id'],'group_code_private',$group_code, $tg_json);
 
         // Init empty keys array.
         $keys = [];
@@ -142,9 +145,6 @@
     }
 }
 
-// Telegram JSON array.
-$tg_json = array();
-
 // Answer callback.
 $tg_json[] = answerCallbackQuery($update['callback_query']['id'], $callback_response, true);
 
diff --git a/mods/raid_set_poke.php b/mods/raid_set_poke.php
index 383711fc..7f28306d 100644
--- a/mods/raid_set_poke.php
+++ b/mods/raid_set_poke.php
@@ -59,11 +59,11 @@
 require_once(LOGIC_PATH .'/update_raid_poll.php');
 $tg_json = update_raid_poll($raid_id, $raid, false, $tg_json, false);
 
+// Alert users.
+$tg_json = alarm($raid, $update['callback_query']['from']['id'], 'new_boss', '', $tg_json);
+
 // Telegram multicurl request.
 curl_json_multi_request($tg_json);
 
-// Alert users.
-alarm($raid, $update['callback_query']['from']['id'], 'new_boss');
-
 // Exit.
 exit();
diff --git a/mods/vote_can_invite.php b/mods/vote_can_invite.php
index aee24549..ea4c5a66 100644
--- a/mods/vote_can_invite.php
+++ b/mods/vote_can_invite.php
@@ -51,15 +51,17 @@
 }
 if($statement_select->rowCount() > 0) {
     if($res['can_invite'] == 0) {
-        alarm($data['id'],$update['callback_query']['from']['id'],'can_invite');
+        $alarm_action = 'can_invite';
     } else {
-        alarm($data['id'],$update['callback_query']['from']['id'],'no_can_invite');
+        $alarm_action = 'no_can_invite';
     }
     // Send vote response.
     require_once(LOGIC_PATH . '/update_raid_poll.php');
 
     $tg_json = update_raid_poll($data['id'], false, $update);
 
+    $tg_json = alarm($data['id'],$update['callback_query']['from']['id'], $alarm_action, '', $tg_json);
+
     $tg_json[] = answerCallbackQuery($update['callback_query']['id'], getTranslation('vote_updated'), true);
 
     curl_json_multi_request($tg_json);
diff --git a/mods/vote_extra.php b/mods/vote_extra.php
index 47238473..bb394b01 100644
--- a/mods/vote_extra.php
+++ b/mods/vote_extra.php
@@ -19,6 +19,9 @@
 // Get the answer.
 $answer = $rs->fetch();
 
+// Telegram JSON array.
+$tg_json = array();
+
 // Write to log.
 debug_log($answer);
 
@@ -36,7 +39,7 @@
             AND   user_id = {$update['callback_query']['from']['id']}
             "
         );
-        alarm($data['id'],$update['callback_query']['from']['id'],'extra_alone',$data['arg']);
+        $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'extra_alone',$data['arg'], $tg_json);
     } else if($answer['can_invite'] == 1 ) {
         // People who are only inviting others can't add extras
         $msg = getTranslation('vote_status_not_allowed');
@@ -68,7 +71,7 @@
                     AND   {$team} < 5
                 "
             );
-            alarm($data['id'],$update['callback_query']['from']['id'],'extra',$data['arg']);
+            $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'extra',$data['arg'], $tg_json);
         } else {
             // Send max remote users reached.
             send_vote_remote_users_limit_reached($update);
@@ -80,7 +83,7 @@
     // Send vote response.
     require_once(LOGIC_PATH . '/update_raid_poll.php');
 
-    $tg_json = update_raid_poll($data['id'], false, $update);
+    $tg_json = update_raid_poll($data['id'], false, $update, $tg_json);
 
     $tg_json[] = answerCallbackQuery($update['callback_query']['id'], getTranslation('vote_updated'), true);
 
diff --git a/mods/vote_pokemon.php b/mods/vote_pokemon.php
index b74a700a..7cd8c7d1 100644
--- a/mods/vote_pokemon.php
+++ b/mods/vote_pokemon.php
@@ -61,7 +61,7 @@
         );
 
         // Send alarm
-        alarm($data['id'],$update['callback_query']['from']['id'],'pok_individual',$data['arg']);
+        $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'pok_individual',$data['arg']);
     } else {
         // Init found and count.
         $found = false;
@@ -92,7 +92,7 @@
                     );
                 }
                 // Send alarm
-                alarm($data['id'],$update['callback_query']['from']['id'],'pok_cancel_individual',$data['arg']);
+                $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'pok_cancel_individual',$data['arg']);
 
                 // Update count.
                 $count = $count - 1;
@@ -106,7 +106,7 @@
         // Not found? Insert!
         if(!$found) {
             // Send alarm
-            alarm($data['id'],$update['callback_query']['from']['id'],'pok_individual',$data['arg']);
+            $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'pok_individual',$data['arg']);
 
             // Insert vote.
             my_query(
@@ -168,7 +168,7 @@
 
     require_once(LOGIC_PATH . '/update_raid_poll.php');
 
-    $tg_json = update_raid_poll($data['id'], false, $update);
+    $tg_json = update_raid_poll($data['id'], false, $update, $tg_json);
 
     $tg_json[] = answerCallbackQuery($update['callback_query']['id'], getTranslation('vote_updated'), true);
 
diff --git a/mods/vote_remote.php b/mods/vote_remote.php
index 45121045..128b4939 100644
--- a/mods/vote_remote.php
+++ b/mods/vote_remote.php
@@ -43,15 +43,15 @@
         );
 
         if($remote_status == 0) {
-            alarm($data['id'],$update['callback_query']['from']['id'],'remote');
+            $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'remote');
         } else {
-            alarm($data['id'],$update['callback_query']['from']['id'],'no_remote');
+            $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'no_remote');
         }
 
         // Send vote response.
         require_once(LOGIC_PATH . '/update_raid_poll.php');
 
-        $tg_json = update_raid_poll($data['id'], false, $update);
+        $tg_json = update_raid_poll($data['id'], false, $update, $tg_json);
 
         $tg_json[] = answerCallbackQuery($update['callback_query']['id'], getTranslation('vote_updated'), true);
 
diff --git a/mods/vote_status.php b/mods/vote_status.php
index d0ae02b3..deb8655a 100644
--- a/mods/vote_status.php
+++ b/mods/vote_status.php
@@ -29,6 +29,9 @@
 // Write to log.
 debug_log($answer);
 
+// Telegram JSON array.
+$tg_json = array();
+
 // Get status to update
 $status = $data['arg'];
 
@@ -82,15 +85,15 @@
                              ]];
                     send_message($update['callback_query']['from']['id'], getTranslation("delete_remote_raid"), $keys);
                 }
-            }else {
-                alarm($data['id'],$update['callback_query']['from']['id'],'status',$status);
+            }elseif($status != 'arrived') {
+                $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'status',$status, $tg_json);
             }
         }
 
        // Send vote response.
         require_once(LOGIC_PATH . '/update_raid_poll.php');
 
-        $tg_json = update_raid_poll($data['id'], false, $update);
+        $tg_json = update_raid_poll($data['id'], false, $update, $tg_json);
 
         $tg_json[] = answerCallbackQuery($update['callback_query']['id'], getTranslation('vote_updated'), true);
 
diff --git a/mods/vote_time.php b/mods/vote_time.php
index af6a70fc..c82ae983 100644
--- a/mods/vote_time.php
+++ b/mods/vote_time.php
@@ -104,7 +104,7 @@
                     AND   user_id = {$update['callback_query']['from']['id']}
                 "
             );
-            alarm($data['id'],$update['callback_query']['from']['id'],'change_time', $attend_time);
+            $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'change_time', $attend_time, $tg_json);
 
         // User has not voted before.
         } else {
@@ -122,7 +122,7 @@
               'alarm' => ($config->RAID_AUTOMATIC_ALARM ? 1 : 0)
             ]);
             // Send Alarm.
-            alarm($data['id'],$update['callback_query']['from']['id'],'new_att', $attend_time);
+            $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],'new_att', $attend_time, $tg_json);
 
             // Enable alerts message. -> only if alert is on
             if($config->RAID_AUTOMATIC_ALARM) {
diff --git a/mods/vote_want_invite.php b/mods/vote_want_invite.php
index ca55869e..6599220d 100644
--- a/mods/vote_want_invite.php
+++ b/mods/vote_want_invite.php
@@ -50,15 +50,17 @@
 }
 if($statement_select->rowCount() > 0) {
     if($res['want_invite'] == 0) {
-        alarm($data['id'],$update['callback_query']['from']['id'],'want_invite');
+        $alarm_action = 'want_invite';
     } else {
-        alarm($data['id'],$update['callback_query']['from']['id'],'no_want_invite');
+        $alarm_action = 'no_want_invite';
     }
     // Send vote response.
     require_once(LOGIC_PATH . '/update_raid_poll.php');
 
     $tg_json = update_raid_poll($data['id'], false, $update);
 
+    $tg_json = alarm($data['id'],$update['callback_query']['from']['id'],$alarm_action, '', $tg_json);
+
     $tg_json[] = answerCallbackQuery($update['callback_query']['id'], getTranslation('vote_updated'), true);
 
     curl_json_multi_request($tg_json);