diff --git a/makepickle.py b/makepickle.py
index 430b7c9..aeee22d 100644
--- a/makepickle.py
+++ b/makepickle.py
@@ -1,21 +1,27 @@
 from os import path
 import pickle
 
+DB_dir = "~tutimura/public_html/cgi-bin/passwd/"
 outdb = {}
-dbpath = path.expanduser("~tutimura/public_html/cgi-bin/passwd/name.txt")
 
-with open(dbpath, "r") as f:
-	for line in f.readlines():
-		if not line: continue
-		no_, reading, name = line.split("\t")
-		if name.count(" ") == 2:
-			first_n, family_n, note = name.split(" ")
-			name = first_n + " " + family_n
-		name = name.strip()
-		outdb[no_] = {"name": name, "reading": reading}
+for dbpath in ["name.txt", "name3.txt"]:
+    dbpath = path.expanduser(DB_dir + dbpath)
+    with open(dbpath, "r") as f:
+        for line in f.readlines():
+            print line, line.count('\t')
+            if not line or line.startswith("#"): continue
+            if line.count('\t') == 2:
+                no_, reading, name = line.split("\t")
+            else:
+                no_, reading, name, email = line.split("\t")
+            if name.count(" ") == 2:
+                first_n, family_n, note = name.split(" ")
+                name = first_n + " " + family_n
+            name = name.strip()
+            outdb[no_] = {"name": name, "reading": reading}
 
 maildb = {}
-mailpath = path.expanduser("~tutimura/public_html/cgi-bin/passwd/mail.txt")
+mailpath = path.expanduser(DB_dir + "mail.txt")
 with open(mailpath, "r") as f:
 	for line in f.readlines():
 		if not line: continue