diff --git a/WowPacketParserModule.V4_4_0_54481/Parsers/AreaTriggerHandler.cs b/WowPacketParserModule.V4_4_0_54481/Parsers/AreaTriggerHandler.cs
index 878f988383..fd2b0a07ec 100644
--- a/WowPacketParserModule.V4_4_0_54481/Parsers/AreaTriggerHandler.cs
+++ b/WowPacketParserModule.V4_4_0_54481/Parsers/AreaTriggerHandler.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using WowPacketParser.Enums;
 using WowPacketParser.Misc;
@@ -61,7 +62,7 @@ public static AreaTriggerCreatePropertiesOrbit ReadAreaTriggerOrbit(WowGuid area
             orbit.CounterClockwise = packet.ReadBit("CounterClockwise", indexes);
             orbit.CanLoop = packet.ReadBit("CanLoop", indexes);
 
-            packet.ReadUInt32("TimeToTarget", indexes);
+            var moveTime = packet.ReadUInt32("TimeToTarget", indexes);
             packet.ReadInt32("ElapsedTimeForMovement", indexes);
             orbit.StartDelay = packet.ReadUInt32("StartDelay", indexes);
             orbit.CircleRadius = packet.ReadSingle("Radius", indexes);
@@ -75,6 +76,10 @@ public static AreaTriggerCreatePropertiesOrbit ReadAreaTriggerOrbit(WowGuid area
             if (hasCenter)
                 packet.ReadVector3("Center", indexes);
 
+            var distance = 2 * Math.PI * orbit.CircleRadius;
+            packet.AddValue("Computed Distance", distance, indexes);
+            packet.AddValue("Computed Speed", (distance / moveTime) * 1000, indexes);
+
             return orbit;
         }
 
diff --git a/WowPacketParserModule.V7_0_3_22248/Parsers/AreaTriggerHandler.cs b/WowPacketParserModule.V7_0_3_22248/Parsers/AreaTriggerHandler.cs
index f7a07d6fdc..153ba3ea4e 100644
--- a/WowPacketParserModule.V7_0_3_22248/Parsers/AreaTriggerHandler.cs
+++ b/WowPacketParserModule.V7_0_3_22248/Parsers/AreaTriggerHandler.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using WowPacketParser.Enums;
 using WowPacketParser.Misc;
@@ -84,7 +85,7 @@ public static AreaTriggerCreatePropertiesOrbit ReadAreaTriggerOrbit(WowGuid area
             orbit.CounterClockwise = packet.ReadBit("CounterClockwise", indexes);
             orbit.CanLoop = packet.ReadBit("CanLoop", indexes);
 
-            packet.ReadUInt32("TimeToTarget", indexes);
+            var moveTime = packet.ReadUInt32("TimeToTarget", indexes);
             packet.ReadInt32("ElapsedTimeForMovement", indexes);
             orbit.StartDelay = packet.ReadUInt32("StartDelay", indexes);
             orbit.CircleRadius = packet.ReadSingle("Radius", indexes);
@@ -98,6 +99,10 @@ public static AreaTriggerCreatePropertiesOrbit ReadAreaTriggerOrbit(WowGuid area
             if (hasCenter)
                 packet.ReadVector3("Center", indexes);
 
+            var distance = 2 * Math.PI * orbit.CircleRadius;
+            packet.AddValue("Computed Distance", distance, indexes);
+            packet.AddValue("Computed Speed", (distance / moveTime) * 1000, indexes);
+
             return orbit;
         }
     }