diff --git a/audio-analyzer.py b/audio-analyzer.py
deleted file mode 100644
index ec22923..0000000
--- a/audio-analyzer.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import json
-import sys
-from collections import OrderedDict
-import vk_api
-
-artistStats = dict()
-
-
-def save():
-	with open(sys.argv[2], "w", encoding="utf-8") as file:
-		data = OrderedDict(sorted(artistStats.items(), key=lambda item: item[1]["count"], reverse=True))
-		file.write(json.dumps(data, sort_keys=False))
-	print("saving")
-
-
-# getting pazans
-pazanIds = None
-pazansFileName = sys.argv[1]
-with open(pazansFileName) as file:
-	pazanIds = [int(line) for line in file]
-
-# getting music
-vk = vk_api.VkApi(token=sys.argv[3], app_id=sys.argv[4])
-
-for index, pazanId in enumerate(pazanIds, start=(sys.argv[5] if len(sys.argv) > 5 else 0)):
-	try:
-		print(index)
-		jsonData = vk.method("audio.get", {"owner_id": pazanId, "need_user": 0, "count": 100})
-		for audio in jsonData["items"]:
-			audioName = audio["artist"] + " - " + audio["title"]
-			artistStatsItem = artistStats.get(audioName, {
-				"url": audio["url"],
-				"genre_id": audio.get("genre_id", ""),
-				"count": 0
-			})
-			artistStatsItem["count"] += 1
-			artistStats[audioName] = artistStatsItem
-
-		if index % 100 == 0:
-			save()
-	except vk_api.ApiError as e:
-		if e.code != 201:
-			print(e)
-			break
-	except Exception as e:
-		print(e)
-		break
-
-save()
diff --git a/audio-fetcher.py b/audio-fetcher.py
new file mode 100644
index 0000000..93b598f
--- /dev/null
+++ b/audio-fetcher.py
@@ -0,0 +1,41 @@
+import json
+import sys
+
+import time
+import vk_api
+
+# getting pazans
+pazanIds = None
+pazansFileName = sys.argv[1]
+with open(pazansFileName) as file:
+	pazanIds = [int(line) for line in file]
+
+# getting music
+vk = vk_api.VkApi(token=sys.argv[3], app_id=sys.argv[4])
+
+for index, pazanId in enumerate(pazanIds, start=(int(sys.argv[5]) if len(sys.argv) > 5 else 0)):
+	done = False
+	while not done:
+		try:
+			print(index)
+			pazanSongs = []
+			jsonData = vk.method("audio.get", {"owner_id": pazanId, "need_user": 0, "count": 100})
+			for audio in jsonData["items"]:
+				pazanSong = {
+					"artist": audio["artist"],
+					"title": audio["title"],
+					"genre_id": audio.get("genre_id", None),
+					"url": audio["url"],
+				}
+				pazanSongs.append(pazanSong)
+			with open(sys.argv[2], "a", encoding="utf-8") as file:
+				file.write(json.dumps({pazanId: pazanSongs}, ensure_ascii=False) + "\n")
+			done = True
+		except vk_api.ApiError as e:
+			if e.code == 9:
+				print("waiting")
+				time.sleep(60)
+			elif e.code == 201 or e.code == 15:
+				done = True
+			else:
+				raise e