diff --git a/index.php b/index.php
index d41fdc6..d74135c 100644
--- a/index.php
+++ b/index.php
@@ -13,6 +13,7 @@
   $catchVal = base_convert($catchVal.$catchid, 10, 36);
   $_SESSION['catch'] = $catchid.":".$catchVal;
 
+/* -- Hopefully depreciated, testing /?id
   if(!empty($_GET['l'])){
     include('api/dbsettings.php');
     $link = $shortdb->real_escape_string(strtolower(stripslashes(strip_tags($_GET['l']))));
@@ -24,6 +25,21 @@
       }
     }
   }
+*/
+
+  if(!empty($_GET)){
+    foreach($_GET as $key=>$value){
+      include('api/dbsettings.php');
+      $link = $shortdb->real_escape_string(strtolower(stripslashes(strip_tags($key))));
+      $sql = "SELECT * FROM `links` WHERE `shortlink` = '$link' LIMIT 1;";
+      if($result = $shortdb->query($sql)){
+        if($row = $result->fetch_assoc()){
+          $link = $row['link'];
+          header("location:$link");
+        }
+      }
+    }
+  }
 
   if(isset($_GET['newbg'])){
     echo "<style>body{background-image: url('assets/images/newbody.jpg') !important;}</style>";