diff --git a/cm700reader.py b/cm700reader.py
index 5e65c31..cd1ff05 100644
--- a/cm700reader.py
+++ b/cm700reader.py
@@ -1,5 +1,6 @@
 import csv
 import datetime
+import glob
 import os
 import sys
 import threading
@@ -141,13 +142,17 @@
     def save_csv(data, header, filename=""):
         # 保存ファイル名の生成
         if filename == "":
-            datestr = datetime.datetime.now().strftime("%m%d")
+            cur_time = datetime.datetime.now()
+            datestr = cur_time.strftime("%Y%m%d")
+            timestr = cur_time.strftime('%H%M%S')
             filename = ""
-            for i in range(2, 6):
-                for ab in ["a", "b"]:
-                    fn = f"tcc6-{i}_{datestr}{ab}.csv"
-                    if (filename == "") and (not os.path.exists(fn)):
-                        filename = fn
+            file_list = glob.glob("./*.csv")
+            print(file_list)
+            for i in range(1, 6):
+                for ab in ["A", "B"]:
+                    fn = f"tcc6-{i}{ab}_{datestr}"
+                    if (filename == "") and len([f for f in file_list if fn in f]) == 0:
+                        filename = f"{fn}_{timestr}.csv"
             infn = input(f"csv保存ファイル名( '{filename}' はenter, 'q'で保存しない) >")
             if infn == "q":
                 return
@@ -224,7 +229,7 @@
 
         data = []
         num_samples = len(config.CC_XY)
-        # num_samples = 3
+        # num_samples = 1
         for i in range(num_samples):
             print("%2d/%2d  " % (i + 1, num_samples), end="")
             self.measurement(data, i + 1 if i < num_samples - 1 else -1)
diff --git a/config.py b/config.py
index bf343fa..b227ed8 100644
--- a/config.py
+++ b/config.py
@@ -10,28 +10,28 @@
 MEAS_TO_MOVE = 2.0  # seconds
 MEAS_TO_RECEIVE = 2.5  # seconds
 CC_XY = [
-    [146.6, -56.6],
-    [145.4, -33.2],
-    [145, -10.5],
-    [145, 11.7],
-    [146.5, 34],
-    [148.5, 57.2],
-    [176.5, -57.9],
-    [175.4, -34.2],
-    [174.5, -11.1],
-    [176, 12.1],
-    [176.6, 35.6],
-    [179.2, 59.4],
-    [206.9, -60],
-    [206, -35],
-    [206, -10.6],
-    [206, 13.5],
-    [207.7, 37.4],
-    [208.9, 61.8],
-    [237.8, -61.3],
-    [236.7, -36.2],
-    [236, -11.3],
-    [236, 13.7],
-    [237.2, 38],
-    [239.4, 63.2],
+	[151.5,-60.0],
+	[150 , -35.6],
+	[149 ,-12.6],
+	[149 , 9.6 ],
+	[150.1, 32.7],
+	[151.9, 56.4],
+	[180.4, -61.4],
+	[179.2, -36.8],
+	[178.8, -13.1],
+	[178.8, 10.3],
+	[179.9, 34.3],
+	[181.3, 58.7],
+	[211.5, -62.7],
+	[210.4, -37.6],
+	[209.6, -13.3],
+	[209.2, 10.6],
+	[209.2, 35.4],
+	[211.6, 59.7],
+	[241.3, -63.8],
+	[240.5, -38.7],
+	[240.5, -13.3],
+	[240.3, 11.9],
+	[240.3, 37.1],
+	[241.8, 61.7],
 ]