diff --git a/tnc/data_handler.py b/tnc/data_handler.py
index a36eccd1..b3e8e555 100644
--- a/tnc/data_handler.py
+++ b/tnc/data_handler.py
@@ -197,7 +197,11 @@ def arq_data_received(data_in):
 
             
             # append received frame to RX_BUFFER
-            static.RX_BUFFER.append({"DXCALL" : static.DXCALLSIGN ,"DATA" : complete_data_frame.decode("utf-8")})
+            ###static.RX_BUFFER.append({"DXCALL" : static.DXCALLSIGN ,"DATA" : complete_data_frame.decode("utf-8")})
+            ###static.RX_BUFFER.append([static.DXCALLSIGN,static.DXGRID,int(time.time()), complete_data_frame.decode("utf-8")])
+            static.RX_BUFFER.append([static.DXCALLSIGN,static.DXGRID,int(time.time()), complete_data_frame.decode("utf-8")])
+
+
 
             # BUILDING ACK FRAME FOR DATA FRAME -----------------------------------------------
             ack_frame = bytearray(14)
diff --git a/tnc/sock.py b/tnc/sock.py
index b3da4ba6..42955961 100644
--- a/tnc/sock.py
+++ b/tnc/sock.py
@@ -122,11 +122,10 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
                     static.DXCALLSIGN = bytes(dxcallsign, 'utf-8')
                     static.DXCALLSIGN_CRC8 = helpers.get_crc_8(static.DXCALLSIGN)
                     
-                    ##dataframe = '{"filename": "'+ filename + '", "filetype" : "' + filetype + '", "data" : "' + data + '", "checksum" : "' + checksum + '"}'
+                    #dataframe = '{"filename": "'+ filename + '", "filetype" : "' + filetype + '", "data" : "' + data + '", "checksum" : "' + checksum + '"}'
                     dataframe = {"filename" : filename , "filetype" :filetype, "data" : data, "checksum" :checksum}
-
+                    #dataframe = {filename: filename}
                     #data_out = bytes(received_json["data"], 'utf-8')
-                    dataframe = json.dumps(dataframe)
                     data_out = bytes(dataframe, 'utf-8')
 
                    
@@ -225,7 +224,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
                         #print(static.RX_BUFFER[i])
                         
                         
-                        output["DATA"].append({"DXCALLSIGN": str(static.RX_BUFFER[i][0], 'utf-8'),"DXGRID": str(static.RX_BUFFER[i][1], 'utf-8'), "TIMESTAMP": static.RX_BUFFER[i][2], "DATA": static.RX_BUFFER[i][3]})  
+                        output["DATA"].append({"DXCALLSIGN": str(static.RX_BUFFER[i][0], 'utf-8'),"DXGRID": str(static.RX_BUFFER[i][1], 'utf-8'), "TIMESTAMP": static.RX_BUFFER[i][2], "DATA": [static.RX_BUFFER[i][3]]})  
                         
                         print(output)
                         jsondata = json.dumps(output)