diff --git a/mesh_bot.py b/mesh_bot.py
index bb3f7fd..3f587d8 100755
--- a/mesh_bot.py
+++ b/mesh_bot.py
@@ -282,10 +282,8 @@ def onReceive(packet, interface):
                             elif rxNode == 2:
                                 print(f"{log_timestamp()} Repeating message on Device1 Channel:{channel_number}")
                                 send_message(rMsg, channel_number, 0, 1)
-
                     else: 
                         print(f"{log_timestamp()} System: Ignoring incoming Device:{rxNode} Channel:{channel_number} Message: {message_string} From: {get_name_from_number(message_from_id)}")
-                
     except KeyError as e:
         print(f"{log_timestamp()} System: Error processing packet: {e} Device:{rxNode}")
         print(packet) # print the packet for debugging
diff --git a/pong_bot.py b/pong_bot.py
index 7779719..0fdb2e6 100755
--- a/pong_bot.py
+++ b/pong_bot.py
@@ -149,16 +149,33 @@ def onReceive(packet, interface):
                             # respond to channel message on the channel itself
                             send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, 0, rxNode)
                 else:
+                    # ignore the message but add it to the message history and repeat it if enabled
                     # add the message to the message history but limit
-                    timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                    if zuluTime:
+                        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                    else:
+                        timestamp = datetime.now().strftime("%Y-%m-%d %I:%M:%S%p")
+                    
                     if len(msg_history) < storeFlimit:
-                        msg_history.append((get_name_from_number(message_from_id), message_string, channel_number, timestamp, rxNode))
+                        msg_history.append((get_name_from_number(message_from_id, 'long', rxNode), message_string, channel_number, timestamp, rxNode))
                     else:
                         msg_history.pop(0)
-                        msg_history.append((get_name_from_number(message_from_id), message_string, channel_number, timestamp, rxNode))
+                        msg_history.append((get_name_from_number(message_from_id, 'long', rxNode), message_string, channel_number, timestamp, rxNode))
                     
-                    print(f"{log_timestamp()} System: Ignoring incoming Device:{rxNode} Channel:{channel_number} Message: {message_string} From: {get_name_from_number(message_from_id)}")
-                
+                    # check if repeater is enabled and the other interface is enabled
+                    if repeater_enabled and interface2_enabled:         
+                        # repeat the message on the other device
+                        rMsg = (f"{message_string} From:{get_name_from_number(message_from_id, 'short', rxNode)}")
+                        # if channel found in the repeater list repeat the message
+                        if str(channel_number) in repeater_channels:
+                            if rxNode == 1:
+                                print(f"{log_timestamp()} Repeating message on Device2 Channel:{channel_number}")
+                                send_message(rMsg, channel_number, 0, 2)
+                            elif rxNode == 2:
+                                print(f"{log_timestamp()} Repeating message on Device1 Channel:{channel_number}")
+                                send_message(rMsg, channel_number, 0, 1)
+                    else: 
+                        print(f"{log_timestamp()} System: Ignoring incoming Device:{rxNode} Channel:{channel_number} Message: {message_string} From: {get_name_from_number(message_from_id)}")
     except KeyError as e:
         print(f"{log_timestamp()} System: Error processing packet: {e} Device:{rxNode}")
         print(packet) # print the packet for debugging