diff --git a/vid_convert.py b/vid_convert.py
index c5c08dd..ee66a0e 100755
--- a/vid_convert.py
+++ b/vid_convert.py
@@ -265,39 +265,22 @@ def convert_video(file, infos, crf, crop, enc_options, interlaced, vhs):
 def create_mkv(filename):
     json_data = []
     json_data.append("--output")
-    json_data.append(f"{filename}_FINAL.mkv")
-    for file in listdir():
-        if f"{filename}_video_t" in file:
-            json_data.append("--no-track-tags")
-            json_data.append("--no-global-tags")
-            json_data.append("--no-chapters")
-            if "t00000" not in file:
-                json_data.append("+")
-            json_data.append("(")
-            json_data.append(file)
-            json_data.append(")")
+    json_data.append(f"NEW_{filename}.mkv")
+    video_file = f"{filename}_video.mkv"
+    json_data += ["--no-track-tags", "--no-global-tags", "--no-chapters",
+                  "(", video_file, ")"]
     for file in listdir():
         if f"{filename}_audio" in file:
             lang = file[-7:][:-4]
-            json_data.append("--no-track-tags")
-            json_data.append("--no-global-tags")
-            json_data.append("--no-chapters")
-            json_data.append("--language")
-            json_data.append(f"0:{lang}")
-            json_data.append("(")
-            json_data.append(file)
-            json_data.append(")")
+            json_data += ["--no-track-tags", "--no-global-tags", "--no-chapters",
+                          "--language", f"0:{lang}",
+                          "(", file, ")"]
     for file in listdir():
         if f"{filename}_subtitle" in file:
-            json_data.append("--no-track-tags")
-            json_data.append("--no-global-tags")
-            json_data.append("--no-chapters")
             lang = file[-7:][:-4]
-            json_data.append("--language")
-            json_data.append(f"0:{lang}")
-            json_data.append("(")
-            json_data.append(file)
-            json_data.append(")")
+            json_data += ["--no-track-tags", "--no-global-tags", "--no-chapters",
+                          "--language", f"0:{lang}",
+                          "(", file, ")"]
     with open(f"/tmp/{filename}.json", "w") as mkvmerge_options:
         mkvmerge_options.write(json.dumps(json_data))
     command = f"mkvmerge -v @/tmp/{filename}.json"
@@ -306,7 +289,7 @@ def create_mkv(filename):
     logging.info(result)
     remove(f"/tmp/{filename}.json")
     for file in listdir():
-        if f"{filename}_video" in file:
+        if file == video_file:
             remove(file)
         if f"{filename}_audio" in file:
             remove(file)