diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua
index 0c63371ba..35cd570c9 100644
--- a/Moose Development/Moose/Core/Point.lua	
+++ b/Moose Development/Moose/Core/Point.lua	
@@ -175,8 +175,6 @@ do -- COORDINATE
     self.y = y
     self.z = z
     
-    self:SetModeA2G()
-
     return self
   end
 
@@ -688,35 +686,6 @@ do -- COORDINATE
   end
 
 
-  --- Set the mode to A2G
-  -- @param #COORDINATE self
-  -- @return #COORDINATE
-  function COORDINATE:SetModeA2G()
-    self.Mode = "A2G"
-  end
-
-  --- Is the mode to A2G
-  -- @param #COORDINATE self
-  -- @return #boolean
-  function COORDINATE:IsModeA2G()
-    return self.Mode == "A2G"
-  end
-  
-  --- Set the mode to A2A
-  -- @param #COORDINATE self
-  -- @return #COORDINATE
-  function COORDINATE:SetModeA2A()
-    self.Mode = "A2A"
-  end
-  
-  --- Is the mode to A2A
-  -- @param #COORDINATE self
-  -- @return #boolean
-  function COORDINATE:IsModeA2A()
-    return self.Mode == "A2A"
-  end
-  
-
   --- Return a BR string from a COORDINATE to the COORDINATE.
   -- @param #COORDINATE self
   -- @param #COORDINATE TargetCoordinate The target COORDINATE.
@@ -822,19 +791,16 @@ do -- COORDINATE
     if IsAir then
       if Settings:IsA2A_BRA()  then
         local Coordinate = Controllable:GetCoordinate()
-        Coordinate:SetModeA2A()
         return self:ToStringBRA( Coordinate, Settings ) 
       end
   
       if Settings:IsA2A_BULLS() then
         local Coordinate = Controllable:GetCoordinate()
-        Coordinate:SetModeA2A()
         return self:ToStringBULLS( Coordinate, Settings )
       end
     else
       if Settings:IsA2G_BRA()  then
         local Coordinate = Controllable:GetCoordinate()
-        Coordinate:SetModeA2A()
         return Controllable and self:ToStringBR( Coordinate, Settings ) or self:ToStringMGRS( Settings )
       end
       if Settings:IsA2G_LL()  then
@@ -979,7 +945,7 @@ do -- POINT_VEC3
 
     local self = BASE:Inherit( self, COORDINATE:NewFromVec3( Vec3 ) ) -- Core.Point#POINT_VEC3
     self:F2( self )
-
+  
     return self
   end
 
@@ -1141,7 +1107,7 @@ do -- POINT_VEC2
     LandHeightAdd = LandHeightAdd or 0
     LandHeight = LandHeight + LandHeightAdd
 
-    local self = BASE:Inherit( self, COORDINATE:New( Vec2.x, LandHeight, Vec2.y ) ) -- Core.Point#POINT_VEC2
+    local self = BASE:Inherit( self, COORDINATE:NewFromVec2( Vec2, LandHeightAdd ) ) -- Core.Point#POINT_VEC2
     self:F2( self )
 
     return self
diff --git a/Moose Development/Moose/Tasking/Task_A2A.lua b/Moose Development/Moose/Tasking/Task_A2A.lua
index c5cb49ebd..aa9092ab1 100644
--- a/Moose Development/Moose/Tasking/Task_A2A.lua	
+++ b/Moose Development/Moose/Tasking/Task_A2A.lua	
@@ -243,8 +243,6 @@ do -- TASK_A2A
   -- @param Wrapper.Unit#UNIT TaskUnit
   function TASK_A2A:SetTargetCoordinate( TargetCoordinate, TaskUnit )
   
-    TargetCoordinate:SetModeA2A()
-  
     local ProcessUnit = self:GetUnitProcess( TaskUnit )
 
     local ActRouteTarget = ProcessUnit:GetProcess( "Engaging", "RouteToTargetPoint" ) -- Actions.Act_Route#ACT_ROUTE_POINT
@@ -373,7 +371,6 @@ do -- TASK_A2A_INTERCEPT
     )
 
     local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
-    TargetCoordinate:SetModeA2A()
     self:SetInfo( "Coordinates", TargetCoordinate )
 
     self:SetInfo( "ThreatLevel", "[" .. string.rep(  "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )
@@ -421,7 +418,6 @@ do -- TASK_A2A_ENGAGE
     )
 
     local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
-    TargetCoordinate:SetModeA2A()
     self:SetInfo( "Coordinates", TargetCoordinate )
 
     self:SetInfo( "ThreatLevel", "[" .. string.rep(  "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )
diff --git a/Moose Development/Moose/Tasking/Task_A2G.lua b/Moose Development/Moose/Tasking/Task_A2G.lua
index 56c43d091..9ad9ca03e 100644
--- a/Moose Development/Moose/Tasking/Task_A2G.lua	
+++ b/Moose Development/Moose/Tasking/Task_A2G.lua	
@@ -381,7 +381,6 @@ do -- TASK_SEAD
     )
 
     local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
-    TargetCoordinate:SetModeA2G()
     self:SetInfo( "Coordinates", TargetCoordinate )
 
     self:SetInfo( "ThreatLevel", "[" .. string.rep(  "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )
@@ -424,7 +423,6 @@ do -- TASK_BAI
     )
 
     local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
-    TargetCoordinate:SetModeA2G()
     self:SetInfo( "Coordinates", TargetCoordinate )
 
     self:SetInfo( "ThreatLevel", "[" .. string.rep(  "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )
@@ -468,7 +466,6 @@ do -- TASK_CAS
     )
 
     local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
-    TargetCoordinate:SetModeA2G()
     self:SetInfo( "Coordinates", TargetCoordinate )
 
     self:SetInfo( "ThreatLevel", "[" .. string.rep(  "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )