diff --git a/hb_router.py b/hb_router.py
index 3f87f4a..53e44bf 100755
--- a/hb_router.py
+++ b/hb_router.py
@@ -87,14 +87,11 @@ class routerMASTER(HBMASTER):
             for rule in RULES['MASTERS'][self._master]['GROUP_VOICE']:
                 _target = rule['DST_NET']
                 if _target in RULES['MASTERS']:
-                    _tmp_data = _data
-                    masters[_target].send_clients(_client, _tmp_data)
+                    masters[_target].send_clients(_data)
                     logger.debug('(%s) Packet routed to master instance: %s', self._master, _target)
                     
                 elif _target in RULES['CLIENTS']:
-                    _tmp_data = _data
-                    _tmp_data = _tmp_data.replace(_radio_id, CONFIG['CLIENTS'][_target]['RADIO_ID'])
-                    clients[_target].send_packet(_tmp_data)
+                    clients[_target].send_packet(_data)
                     logger.debug('(%s) Packet routed to client instance: %s', self._master, _target)
                     
                 else:
@@ -108,14 +105,11 @@ class routerCLIENT(HBCLIENT):
             for rule in RULES['CLIENTS'][self._client]['GROUP_VOICE']:
                 _target = rule['DST_NET']
                 if _target in RULES['MASTERS']:
-                    _tmp_data = _data
-                    masters[_target].send_packet(_client, _tmp_data)
+                    masters[_target].send_clients(_data)
                     logger.debug('(%s) Packet routed to master instance: %s', self._client, _target)
                     
                 elif _target in RULES['CLIENTS']:
-                    _tmp_data = _data
-                    _tmp_data = _tmp_data.replace(_radio_id, CONFIG['CLIENTS'][_target]['RADIO_ID'])
-                    clients[_target].send_packet(_tmp_data)
+                    clients[_target].send_packet(_data)
                     logger.debug('(%s) Packet routed to client instance: %s', self._client, _target)
                     
                 else:
diff --git a/hblink.py b/hblink.py
index 86629b0..e993629 100755
--- a/hblink.py
+++ b/hblink.py
@@ -190,10 +190,8 @@ class HBMASTER(DatagramProtocol):
                 
     def send_clients(self, _packet):
         for _client in self._clients:
-            #add destiantion re-writer here split _data and insert target client radio_id at: _data[11:15]
-            _tmp_packet = _packet[:11] + _client + _packet[15:]
-            self.send_packet(_client, _tmp_packet)
-        logger.debug('(%s) Packet sent to all connected clients', self._master)
+            self.send_packet(_client, _packet)
+            logger.debug('(%s) Packet sent to client %s', self._master, _client)
     
     def send_packet(self, _client, _packet):
         _ip = self._clients[_client]['IP']