diff --git a/Distribution/Data/teleporters.json b/Distribution/Data/teleporters.json
index 82a4fe684..91e70eb0b 100644
--- a/Distribution/Data/teleporters.json
+++ b/Distribution/Data/teleporters.json
@@ -40,9 +40,9 @@
     "back": true
   },
   {
-    "src": { "map": "Felucca", "loc": [589, 1637, 0] },
-    "dst": { "map": "Felucca", "loc": [6575, 888, 0] },
-    "back": false
+    "src": { "map": "Felucca", "loc": [588, 1637, 0] },
+    "dst": { "map": "Felucca", "loc": [6472, 868, 26] },
+    "back": true
   },
   {
     "src": { "map": "Felucca", "loc": [766, 1645, 0] },
@@ -2054,16 +2054,6 @@
     "dst": { "map": "Felucca", "loc": [6503, 88, 0] },
     "back": false
   },
-  {
-    "src": { "map": "Felucca", "loc": [6488, 849, 40] },
-    "dst": { "map": "Felucca", "loc": [6587, 867, 0] },
-    "back": false
-  },
-  {
-    "src": { "map": "Felucca", "loc": [6488, 850, 41] },
-    "dst": { "map": "Felucca", "loc": [6587, 868, 0] },
-    "back": false
-  },
   {
     "src": { "map": "Felucca", "loc": [6540, 116, -15] },
     "dst": { "map": "Felucca", "loc": [6537, 138, -20] },
@@ -2085,13 +2075,8 @@
     "back": false
   },
   {
-    "src": { "map": "Felucca", "loc": [6574, 889, 0] },
-    "dst": { "map": "Felucca", "loc": [6472, 869, 20] },
-    "back": false
-  },
-  {
-    "src": { "map": "Felucca", "loc": [6575, 889, 0] },
-    "dst": { "map": "Felucca", "loc": [6473, 869, 20] },
+    "src": { "map": "Felucca", "loc": [6477, 860, 9] },
+    "dst": { "map": "Felucca", "loc": [6574, 889, 0] },
     "back": false
   },
   {
@@ -2116,7 +2101,7 @@
   },
   {
     "src": { "map": "Felucca", "loc": [6588, 867, 0] },
-    "dst": { "map": "Felucca", "loc": [6489, 849, 39] },
+    "dst": { "map": "Felucca", "loc": [6488, 849, 40] },
     "back": false
   },
   {
@@ -2220,8 +2205,13 @@
     "back": true
   },
   {
-    "src": { "map": "Trammel", "loc": [589, 1637, 0] },
-    "dst": { "map": "Trammel", "loc": [6575, 888, 0] },
+    "src": { "map": "Trammel", "loc": [588, 1637, 0] },
+    "dst": { "map": "Trammel", "loc": [6472, 868, 26] },
+    "back": true
+  },
+  {
+    "src": { "map": "Trammel", "loc": [6477, 860, 9] },
+    "dst": { "map": "Trammel", "loc": [6574, 889, 0] },
     "back": false
   },
   {
@@ -4179,16 +4169,6 @@
     "dst": { "map": "Trammel", "loc": [6503, 88, 0] },
     "back": false
   },
-  {
-    "src": { "map": "Trammel", "loc": [6488, 849, 40] },
-    "dst": { "map": "Trammel", "loc": [6587, 867, 0] },
-    "back": false
-  },
-  {
-    "src": { "map": "Trammel", "loc": [6488, 850, 41] },
-    "dst": { "map": "Trammel", "loc": [6587, 868, 0] },
-    "back": false
-  },
   {
     "src": { "map": "Trammel", "loc": [6540, 116, -15] },
     "dst": { "map": "Trammel", "loc": [6537, 138, -20] },
@@ -4209,16 +4189,6 @@
     "dst": { "map": "Trammel", "loc": [6576, 73, 0] },
     "back": false
   },
-  {
-    "src": { "map": "Trammel", "loc": [6574, 889, 0] },
-    "dst": { "map": "Trammel", "loc": [6472, 869, 20] },
-    "back": false
-  },
-  {
-    "src": { "map": "Trammel", "loc": [6575, 889, 0] },
-    "dst": { "map": "Trammel", "loc": [6473, 869, 20] },
-    "back": false
-  },
   {
     "src": { "map": "Trammel", "loc": [6577, 159, 13] },
     "dst": { "map": "Trammel", "loc": [6577, 177, 30] },
@@ -4241,7 +4211,7 @@
   },
   {
     "src": { "map": "Trammel", "loc": [6588, 867, 0] },
-    "dst": { "map": "Trammel", "loc": [6489, 849, 39] },
+    "dst": { "map": "Trammel", "loc": [6488, 849, 40] },
     "back": false
   },
   {