diff --git a/app/src/main/java/cz/martykan/webtube/Downloader.java b/app/src/main/java/cz/martykan/webtube/Downloader.java
index c73976b..3c6bb9a 100644
--- a/app/src/main/java/cz/martykan/webtube/Downloader.java
+++ b/app/src/main/java/cz/martykan/webtube/Downloader.java
@@ -3,11 +3,14 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.util.Log;
 
 import java.net.URLEncoder;
 
 public class Downloader {
     Context context;
+    String part1;
+    String part2;
 
     public Downloader(Context context) {
         this.context = context;
@@ -15,12 +18,13 @@ public Downloader(Context context) {
 
     // Minimal effort solution, to be improved
     public void download(String url) {
-        String encodedURL = url;
-        try {
-            encodedURL = URLEncoder.encode(url, "utf-8");
-        } catch (Exception e) {
-            e.printStackTrace();
+        if (url.contains("/watch")) {
+            String[] splitUrl = url.split("=");
+            part1 = splitUrl[0];
+            part2 = splitUrl[1];
+        } else {
+            Log.i("Invalid Url Format", "");
         }
-        context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://dirpy.com/studio?url=" + encodedURL)));
+        context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.y2mate.com/youtube/" + part2)));
     }
 }