diff --git a/Libraries/x-saherelm.x-poi.lib.mq5 b/Libraries/x-saherelm.x-poi.lib.mq5
index 3a39b23f..9c8963bc 100644
--- a/Libraries/x-saherelm.x-poi.lib.mq5
+++ b/Libraries/x-saherelm.x-poi.lib.mq5
@@ -6113,6 +6113,25 @@ struct XOBFVG
         return fvg != NULL &&
                fvg.IsValid();
     }
+
+    //
+    void UpdateTo(datetime value = NULL)
+    {
+        //
+        value = NormalizeTime(value);
+
+        //
+        if (HasOB())
+        {
+            ob.To(value);
+        }
+
+        //
+        if (HasFVG())
+        {
+            fvg.To(value);
+        }
+    }
 };
 
 //
@@ -8739,6 +8758,7 @@ int ExtractOBFVGZones(
 
             //
             // Detecting FVG ...
+            idx = -1;
             for (int j = 0; j < ArraySize(tmpFVGs); j++)
             {
                 //
@@ -8784,6 +8804,7 @@ int ExtractOBFVGZones(
                 }
 
                 //
+                idx = j;
                 iOBFVG.fvg = jFVG;
             }
 
@@ -8796,6 +8817,18 @@ int ExtractOBFVGZones(
                 continue;
             }
 
+            //
+            // Remove Selected FVG from List ...
+            if (IsValidIndex(idx))
+            {
+                //
+                ArrayRemove(
+                    tmpFVGs,
+                    idx,
+                    1 //
+                );
+            }
+
             //
             // TODO: Detect Other POI(s) ...
 
@@ -8809,6 +8842,9 @@ int ExtractOBFVGZones(
                 continue;
             }
 
+            //
+            iOBFVG.UpdateTo(cTime);
+
             //
             AddRef(
                 iOBFVG,