diff --git a/fish/.config/fish/functions/ydl.fish b/fish/.config/fish/functions/ydl.fish
index 4d3a19d..dd8e393 100644
--- a/fish/.config/fish/functions/ydl.fish
+++ b/fish/.config/fish/functions/ydl.fish
@@ -1,5 +1,23 @@
 # Defined in /tmp/fish.CDDaTn/ydl.fish @ line 2
 function ydl
-  youtube-dl --extract-audio --keep-video  --add-metadata "$argv[1]"
-  rm -f *.f???.*
+  set -l addargs "--extract-audio --keep-video"
+  set -l url $argv[1]
+
+  echo "args = $argv[1] -- $argv[2]"
+
+  if contains -- "-a" $argv
+      echo "has -a"
+      set addargs "--extract-audio"
+      set url $argv[2]
+  end
+
+  if contains -- "-v" $argv
+      echo "has -v"
+      set -e addargs
+      set url $argv[2]
+  end
+
+  echo youtube-dl $addargs --add-metadata "$url"
+  youtube-dl $addargs --add-metadata "$url"
+  rm -f "*.f???.*"
 end