diff --git a/Assets/GWConquest/Scripts/Zone.cs b/Assets/GWConquest/Scripts/Zone.cs
index 750842f..22ce492 100644
--- a/Assets/GWConquest/Scripts/Zone.cs
+++ b/Assets/GWConquest/Scripts/Zone.cs
@@ -33,12 +33,14 @@ namespace GWConquest
         [SerializeField]
         private int zoneId;
 
+        private List<Formation> formations = new List<Formation>();
+
         public IEnumerable<Formation> Formations
         {
-            //get => formations;
-            get {
+            get => formations;
+            /*get {
                 return Formation.AllFormations.Where(f => f.State.CurrentZone == zoneId);
-            }
+            }*/
         }
 
         private static Dictionary<int, Zone> zoneDict = new Dictionary<int, Zone>();
@@ -105,6 +107,8 @@ namespace GWConquest
 
         public void OnFormationArrived(Formation formation)
         {
+            formations.Add(formation);
+
             OnFormationChanged(formation);
 
             if (BoltNetwork.IsServer)
@@ -158,6 +162,7 @@ namespace GWConquest
                 }
             }
 
+            formations.Remove(formation);
         }
 
         public void OnFormationChanged(Formation formation)