diff --git a/src/main/java/info/istlab/ServerTester/SimpleWebSocketServer.java b/src/main/java/info/istlab/ServerTester/SimpleWebSocketServer.java
index a0f59d5..b933e09 100644
--- a/src/main/java/info/istlab/ServerTester/SimpleWebSocketServer.java
+++ b/src/main/java/info/istlab/ServerTester/SimpleWebSocketServer.java
@@ -42,6 +42,7 @@
     public void onOpen(WebSocket conn, ClientHandshake handshake) {
         System.out.println("[SWS] New connection from " + conn.getRemoteSocketAddress());
         conn.send("Welcome to the server! " + conn.getRemoteSocketAddress()); // クライアントにメッセージを送信
+        broadcastMessage("◆◆◆ "+conn.getRemoteSocketAddress() + " が接続しました ◆◆◆"); // すべてのクライアントにメッセージを送信
     }
 
     @Override
@@ -51,9 +52,9 @@
 
     @Override
     public void onMessage(WebSocket conn, String message) {
-        System.out.println("[SWS] Received: " + message);
+        System.out.println("[SWS] Received: " + message + " from " + conn.getRemoteSocketAddress());
         // conn.send("Echo: " + message); // 受け取ったメッセージをそのまま返す
-        broadcastMessage(message); // すべてのクライアントにメッセージを送信
+        broadcastMessage(message + " (from "+conn.getRemoteSocketAddress()+")"); // すべてのクライアントにメッセージを送信
     }
 
     @Override
diff --git a/wschat.html b/wschat.html
index 1853f04..00434e9 100644
--- a/wschat.html
+++ b/wschat.html
@@ -27,7 +27,10 @@
             logMessage('Connected to the WebSocket server');
         };
         ws.onmessage = function (event) {
-            logMessage('Received: ' + event.data);
+            const now = new Date();
+            const timestamp = now.toLocaleString();
+            logMessage('[' + timestamp + ']: ' + event.data);
+            console.log(event);
         };
         ws.onclose = function () {
             logMessage('Disconnected from the WebSocket server');
@@ -69,4 +72,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>