diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 1d25e886a..8f7161308 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1768,6 +1768,11 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const
             if (x > 3823.0f && x < 4141.5f && y > 6247.0f && y < 64890.0f && z < 42.5f)
                 areaflag = 1723;
             break;
+        // Moonrest Gardens
+        case 1787:
+            if (x > 3315.3f && x < 3361.6f && y > 2469.4f && y < 2565.8f && z > 197.0f)
+                areaflag = 1786;                            // Surge Needle (cords not entirely correct, will need round circle if this is really needed(see spell 47097 eff 77))
+            break;
         // Dalaran
         case 2492:                                          // Forlorn Woods (Crystalsong Forest)
         case 2371:                                          // Valley of Echoes (Icecrown Glacier)
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index c88e77145..4f1427f15 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5145,6 +5145,19 @@ void Spell::EffectScriptEffect(uint32 effIndex)
 
                     break;
                 }
+                // Surge Needle Teleporter
+                case 47097:
+                {
+                    if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    if (unitTarget->GetAreaId() == 4156)
+                        unitTarget->CastSpell(unitTarget, 47324, true);
+                    else if (unitTarget->GetAreaId() == 4157)
+                        unitTarget->CastSpell(unitTarget, 47325, true);
+
+                    break;
+                }
                 // Emblazon Runeblade
                 case 51770:
                 {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index ec9af1ef3..6968d2405 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9105"
+ #define REVISION_NR "9106"
 #endif // __REVISION_NR_H__