diff --git a/bridges/s3-bridge/s3_bridge.py b/bridges/s3-bridge/s3_bridge.py
index cc69ee8..ba8605b 100644
--- a/bridges/s3-bridge/s3_bridge.py
+++ b/bridges/s3-bridge/s3_bridge.py
@@ -1,65 +1,77 @@
 import serial
 import threading
-import time
+import datetime
 import sys
+import os
 
-REAL_PORT = "COM5"     # MiniMate hardware
-VIRTUAL_PORT = "COM4"  # Bridge side of COM3<->COM4 pair
+PORT_A = "COM5"   # Real device
+PORT_B = "COM4"   # Virtual port for Blastware
 BAUD = 38400
 
+class SessionLogger:
+    def __init__(self):
+        ts = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+        self.filename = f"s3_session_{ts}.log"
+        self.file = open(self.filename, "w", buffering=1)
+        print(f"[LOG] Writing session log to {self.filename}")
 
-def hex_dump(data):
-    return " ".join(f"{b:02X}" for b in data)
+    def log(self, direction, data):
+        now = datetime.datetime.now().strftime("%H:%M:%S.%f")[:-3]
+        hex_string = " ".join(f"{b:02X}" for b in data)
+        line = f"[{now}] [{direction}] {hex_string}"
+        print(line)
+        self.file.write(line + "\n")
+
+    def close(self):
+        print("[LOG] Closing session log")
+        self.file.close()
 
 
-def forward(src, dst, label):
-    while True:
-        try:
-            data = src.read(1024)  # blocking read
+def forward(src, dst, direction, logger):
+    try:
+        while True:
+            data = src.read(src.in_waiting or 1)
             if data:
-                print(f"[{label}] {hex_dump(data)}")
+                logger.log(direction, data)
                 dst.write(data)
-        except serial.SerialException as e:
-            print(f"[{label}] Serial error: {e}")
-            break
-        except Exception as e:
-            print(f"[{label}] Unexpected error: {e}")
-            break
+    except Exception as e:
+        print(f"[ERROR] {direction}: {e}")
 
 
 def main():
     print("Opening ports...")
 
-    real = serial.Serial(
-        REAL_PORT,
-        BAUD,
-        timeout=0.1,        # IMPORTANT: not zero
-        write_timeout=0.1
+    ser_a = serial.Serial(PORT_A, BAUD, timeout=0)
+    ser_b = serial.Serial(PORT_B, BAUD, timeout=0)
+
+    print(f"Connected: {PORT_A} <-> {PORT_B}")
+
+    logger = SessionLogger()
+
+    t1 = threading.Thread(
+        target=forward,
+        args=(ser_b, ser_a, "BLASTWARE -> S3", logger),
+        daemon=True
     )
 
-    virt = serial.Serial(
-        VIRTUAL_PORT,
-        BAUD,
-        timeout=0.1,
-        write_timeout=0.1
+    t2 = threading.Thread(
+        target=forward,
+        args=(ser_a, ser_b, "S3 -> BLASTWARE", logger),
+        daemon=True
     )
 
-    print(f"Connected: {REAL_PORT} <-> {VIRTUAL_PORT}")
-
-    t1 = threading.Thread(target=forward, args=(virt, real, "BLASTWARE -> S3"), daemon=True)
-    t2 = threading.Thread(target=forward, args=(real, virt, "S3 -> BLASTWARE"), daemon=True)
-
     t1.start()
     t2.start()
 
     try:
         while True:
-            time.sleep(1)
+            pass
     except KeyboardInterrupt:
-        print("Stopping bridge...")
-        real.close()
-        virt.close()
-        sys.exit(0)
+        print("\n[INFO] Ctrl+C detected, shutting down...")
+    finally:
+        logger.close()
+        ser_a.close()
+        ser_b.close()
 
 
 if __name__ == "__main__":