diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
index 7ca2911..8425a01 100644
--- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
@@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
+import com.bbn.hadder.utils.Request;
 
 public class SpankCommand implements Command {
 
@@ -20,25 +15,13 @@ public class SpankCommand implements Command {
     public void executed(String[] args, CommandEvent e) {
         if (e.getTextChannel().isNSFW()) {
 
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/").build();
+            String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/");
 
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
-                                url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", "")).setFooter("Spank").build()).queue();
-
-            } catch (IOException ex) {
-                ex.printStackTrace();
-            }
+            e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                    .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url)
+                    .setImage(url)
+                    .setFooter("Spank")
+                    .build()).queue();
 
         } else {
             e.getTextChannel()