diff --git a/Experts/RsiMomentumEA.mq5 b/Experts/RsiMomentumEA.mq5
index e69de29..66353fe 100644
--- a/Experts/RsiMomentumEA.mq5
+++ b/Experts/RsiMomentumEA.mq5
@@ -0,0 +1,491 @@
+//+------------------------------------------------------------------+
+//| RsiMomentumEA.mq5                                                |
+//| EA tự động — logic độc lập (không đọc RsiMomentumIndicator).     |
+//| RSI + EMA9/WMA45 trên RSI + EMA200(close), signal, mũi tên, panel |
+//+------------------------------------------------------------------+
+#property copyright "RsiMomentumEA"
+#property version   "3.01"
+
+//--- Input (khớp Indicators/RsiMomentumIndicator/Lib/Inputs.mqh)
+input group "Chỉ báo"
+input int    InpRSIPeriod         = 14;
+input int    InpEMA9Period        = 9;
+input int    InpWMA45Period       = 45;
+input int    InpEMATrendPeriod    = 200;
+
+input group "Bộ lọc trend"
+input int    InpTrendConfirmBars  = 1;
+
+input group "Bộ lọc RSI"
+input double InpRSIOverbought     = 70.0;
+input double InpRSIOversold       = 30.0;
+
+input group "Bộ lọc EMA9 vs WMA45 (chống nhiễu)"
+input int    InpEma9PersistBars   = 3;
+
+input group "Mũi tên giao cắt"
+input color  InpArrowUpColor      = clrLime;
+input color  InpArrowDownColor    = clrTomato;
+input int    InpArrowOffsetPts    = 30;
+input int    InpArrowSize         = 1;
+
+input group "Panel thông tin"
+input bool   InpShowPanel         = true;
+
+input group "Cảnh báo / Notification (khi có entry mới)"
+input bool   InpAlertPush         = true;
+input bool   InpAlertPopup        = true;
+input bool   InpAlertSound        = true;
+input string InpSoundBuy          = "alert.wav";
+input string InpSoundSell         = "alert2.wav";
+input bool   InpAlertEmail        = false;
+input bool   InpAlertOnBar0       = false;
+
+//--- Buffers & state (trùng State.mqh)
+double buf_RSI[];
+double buf_EMA9[];
+double buf_WMA45[];
+double buf_Signal[];
+double buf_EMA200[];
+double buf_Trend[];
+
+int h_RSI    = INVALID_HANDLE;
+int h_EMA9   = INVALID_HANDLE;
+int h_WMA45  = INVALID_HANDLE;
+int h_EMA200 = INVALID_HANDLE;
+
+const string OBJ_PREFIX   = "RsiMomEA_";
+const string LBL_TITLE    = OBJ_PREFIX + "title";
+const string LBL_TREND    = OBJ_PREFIX + "trend";
+const string LBL_RSI_VAL  = OBJ_PREFIX + "rsi";
+const string LBL_EMA9VAL  = OBJ_PREFIX + "ema9";
+const string LBL_WMA45VAL = OBJ_PREFIX + "wma45";
+
+datetime g_lastAlertBuyBar  = 0;
+datetime g_lastAlertSellBar = 0;
+bool     g_firstCalc        = true;
+static int g_prevCalculated = 0;
+
+long ActChart() { return ChartID(); }
+
+//+------------------------------------------------------------------+
+bool Handles_CreateAll()
+{
+  h_RSI = iRSI(_Symbol, _Period, InpRSIPeriod, PRICE_CLOSE);
+  if (h_RSI == INVALID_HANDLE)
+  {
+    Print("[RsiMomEA] Không tạo được handle RSI");
+    return false;
+  }
+  h_EMA9 = iMA(_Symbol, _Period, InpEMA9Period, 0, MODE_EMA, h_RSI);
+  if (h_EMA9 == INVALID_HANDLE)
+  {
+    Print("[RsiMomEA] Không tạo được handle EMA9(RSI)");
+    return false;
+  }
+  h_WMA45 = iMA(_Symbol, _Period, InpWMA45Period, 0, MODE_LWMA, h_RSI);
+  if (h_WMA45 == INVALID_HANDLE)
+  {
+    Print("[RsiMomEA] Không tạo được handle WMA45(RSI)");
+    return false;
+  }
+  h_EMA200 = iMA(_Symbol, _Period, InpEMATrendPeriod, 0, MODE_EMA, PRICE_CLOSE);
+  if (h_EMA200 == INVALID_HANDLE)
+  {
+    Print("[RsiMomEA] Không tạo được handle EMA200");
+    return false;
+  }
+  return true;
+}
+
+//+------------------------------------------------------------------+
+void Handles_ReleaseAll()
+{
+  if (h_RSI    != INVALID_HANDLE) IndicatorRelease(h_RSI);
+  if (h_EMA9   != INVALID_HANDLE) IndicatorRelease(h_EMA9);
+  if (h_WMA45  != INVALID_HANDLE) IndicatorRelease(h_WMA45);
+  if (h_EMA200 != INVALID_HANDLE) IndicatorRelease(h_EMA200);
+  h_RSI = h_EMA9 = h_WMA45 = h_EMA200 = INVALID_HANDLE;
+}
+
+//+------------------------------------------------------------------+
+void CreateLabel(const string name, const string text, const color clr,
+                 const int x, const int y, const int fontSize = 9)
+{
+  const long ch = ActChart();
+  if (ObjectFind(ch, name) >= 0) return;
+  ObjectCreate(ch, name, OBJ_LABEL, 0, 0, 0);
+  ObjectSetInteger(ch, name, OBJPROP_CORNER,     CORNER_RIGHT_UPPER);
+  ObjectSetInteger(ch, name, OBJPROP_XDISTANCE,  x);
+  ObjectSetInteger(ch, name, OBJPROP_YDISTANCE,  y);
+  ObjectSetInteger(ch, name, OBJPROP_FONTSIZE,   fontSize);
+  ObjectSetString (ch, name, OBJPROP_FONT,       "Consolas");
+  ObjectSetInteger(ch, name, OBJPROP_BACK,       false);
+  ObjectSetInteger(ch, name, OBJPROP_SELECTABLE, false);
+  ObjectSetInteger(ch, name, OBJPROP_HIDDEN,     true);
+  ObjectSetInteger(ch, name, OBJPROP_COLOR,      clr);
+  ObjectSetString (ch, name, OBJPROP_TEXT,       text);
+}
+
+//+------------------------------------------------------------------+
+void UpdateLabel(const string name, const string text, const color clr)
+{
+  const long ch = ActChart();
+  if (ObjectFind(ch, name) < 0) return;
+  ObjectSetString (ch, name, OBJPROP_TEXT,  text);
+  ObjectSetInteger(ch, name, OBJPROP_COLOR, clr);
+}
+
+//+------------------------------------------------------------------+
+void Panel_CreateAll()
+{
+  if (!InpShowPanel) return;
+  CreateLabel(LBL_TITLE,    "─ RSI MOMENTUM (EA) ─", clrWhite,        10, 14, 10);
+  CreateLabel(LBL_TREND,    "Trend : ---",         clrSilver,        10, 34, 9);
+  CreateLabel(LBL_RSI_VAL,  "RSI   : ---",         clrMediumOrchid,  10, 51, 9);
+  CreateLabel(LBL_EMA9VAL,  "EMA9  : ---",         clrDarkOrange,    10, 68, 9);
+  CreateLabel(LBL_WMA45VAL, "WMA45 : ---",         clrDodgerBlue,    10, 85, 9);
+}
+
+//+------------------------------------------------------------------+
+void Panel_Update(const double &closeArr[], const double &ema200Arr[],
+                  const int trendN, const int rates_total)
+{
+  if (!InpShowPanel) return;
+  if (rates_total <= trendN + 1) return;
+  if (ema200Arr[1] <= 0.0) return;
+
+  bool panelTrendUp   = true;
+  bool panelTrendDown = true;
+  for (int k = 0; k < trendN; k++)
+  {
+    const int idx = 1 + k;
+    if (ema200Arr[idx] <= 0.0) { panelTrendUp = false; panelTrendDown = false; break; }
+    if (closeArr[idx] <= ema200Arr[idx]) panelTrendUp   = false;
+    if (closeArr[idx] >= ema200Arr[idx]) panelTrendDown = false;
+  }
+
+  string trendTxt;
+  color  trendClr;
+  if      (panelTrendUp)   { trendTxt = StringFormat("Trend :  UPTREND   (%d closes > EMA200)", trendN); trendClr = InpArrowUpColor; }
+  else if (panelTrendDown) { trendTxt = StringFormat("Trend :  DOWNTREND (%d closes < EMA200)", trendN); trendClr = InpArrowDownColor; }
+  else                     { trendTxt = "Trend :  RANGE / SWITCHING";                                    trendClr = clrSilver; }
+
+  UpdateLabel(LBL_TREND,    trendTxt, trendClr);
+  UpdateLabel(LBL_RSI_VAL,  StringFormat("RSI   : %6.2f", buf_RSI[1]),  clrMediumOrchid);
+  UpdateLabel(LBL_EMA9VAL,  StringFormat("EMA9  : %6.2f", buf_EMA9[1]), clrDarkOrange);
+  UpdateLabel(LBL_WMA45VAL, StringFormat("WMA45 : %6.2f", buf_WMA45[1]), clrDodgerBlue);
+}
+
+//+------------------------------------------------------------------+
+void FireSignalAlert(const bool isBuy, const datetime barTime, const double price,
+                     const double rsiVal, const double ema9Val, const double wma45Val, const double ema200Val)
+{
+  const string dir   = isBuy ? "BUY" : "SELL";
+  const string tf    = EnumToString((ENUM_TIMEFRAMES)_Period);
+  const string tfTxt = StringSubstr(tf, 7);
+  const int    dig   = (int)SymbolInfoInteger(_Symbol, SYMBOL_DIGITS);
+
+  const string pushMsg = StringFormat("[RsiMomEA] %s %s %s @ %s | RSI=%.1f EMA9=%.1f WMA45=%.1f",
+                                      dir, _Symbol, tfTxt, DoubleToString(price, dig), rsiVal, ema9Val, wma45Val);
+  const string fullMsg = StringFormat("RsiMomEA %s signal\n%s %s @ %s\nRSI=%.2f  EMA9=%.2f  WMA45=%.2f\nEMA200=%s\nBar: %s",
+                                      dir, _Symbol, tfTxt, DoubleToString(price, dig),
+                                      rsiVal, ema9Val, wma45Val, DoubleToString(ema200Val, dig),
+                                      TimeToString(barTime, TIME_DATE|TIME_MINUTES));
+
+  if (InpAlertPush)
+  {
+    if (!SendNotification(pushMsg))
+      PrintFormat("[RsiMomEA] SendNotification FAILED err=%d", GetLastError());
+  }
+  if (InpAlertPopup)
+    Alert(pushMsg);
+  if (InpAlertSound)
+  {
+    const string snd = isBuy ? InpSoundBuy : InpSoundSell;
+    if (StringLen(snd) > 0)
+      PlaySound(snd);
+  }
+  if (InpAlertEmail)
+    SendMail(StringFormat("RsiMomEA %s %s %s", dir, _Symbol, tfTxt), fullMsg);
+
+  Print("[RsiMomEA] >>> ", pushMsg);
+}
+
+//+------------------------------------------------------------------+
+void Alerts_CheckAndFire(const datetime &timeArr[], const double &closeArr[],
+                         const double &ema200Arr[], const int need, const int rates_total)
+{
+  if (g_firstCalc)
+  {
+    if (need > 1)
+    {
+      g_lastAlertBuyBar  = timeArr[1];
+      g_lastAlertSellBar = timeArr[1];
+    }
+    g_firstCalc = false;
+    return;
+  }
+
+  const int alertShift = InpAlertOnBar0 ? 0 : 1;
+  if (alertShift >= need || alertShift + 1 >= rates_total) return;
+
+  const datetime alertBarTime = timeArr[alertShift];
+
+  if (buf_Signal[alertShift] > 0.5 && alertBarTime != g_lastAlertBuyBar)
+  {
+    FireSignalAlert(true, alertBarTime, closeArr[alertShift],
+                    buf_RSI[alertShift], buf_EMA9[alertShift], buf_WMA45[alertShift], ema200Arr[alertShift]);
+    g_lastAlertBuyBar = alertBarTime;
+  }
+  else if (buf_Signal[alertShift] < -0.5 && alertBarTime != g_lastAlertSellBar)
+  {
+    FireSignalAlert(false, alertBarTime, closeArr[alertShift],
+                    buf_RSI[alertShift], buf_EMA9[alertShift], buf_WMA45[alertShift], ema200Arr[alertShift]);
+    g_lastAlertSellBar = alertBarTime;
+  }
+}
+
+//+------------------------------------------------------------------+
+void SignalScan_Run(const int barsToScan, const int rates_total, const int need, const int trendN,
+                    const datetime &timeArr[], const double &highArr[], const double &lowArr[],
+                    const double &closeArr[], const double &ema200Arr[])
+{
+  const long   ch    = ActChart();
+  const double arrowOffset = InpArrowOffsetPts * _Point;
+
+  buf_Signal[0] = 0.0;
+  buf_Trend[0]  = 0.0;
+  buf_EMA200[0] = (need > 0) ? ema200Arr[0] : 0.0;
+
+  for (int i = barsToScan; i >= 1; i--)
+  {
+    buf_Signal[i] = 0.0;
+    buf_Trend[i]  = 0.0;
+    buf_EMA200[i] = (i < need) ? ema200Arr[i] : 0.0;
+
+    if (i + 1 >= rates_total) continue;
+    if (i + trendN >= need) continue;
+    if (ema200Arr[i] <= 0.0) continue;
+
+    bool trendUp   = true;
+    bool trendDown = true;
+    for (int k = 0; k < trendN; k++)
+    {
+      const int idx = i + k;
+      if (ema200Arr[idx] <= 0.0) { trendUp = false; trendDown = false; break; }
+      if (closeArr[idx] <= ema200Arr[idx]) trendUp   = false;
+      if (closeArr[idx] >= ema200Arr[idx]) trendDown = false;
+      if (!trendUp && !trendDown) break;
+    }
+    buf_Trend[i] = trendUp ? 1.0 : (trendDown ? -1.0 : 0.0);
+
+    const bool crossUp   = (buf_RSI[i+1] <= buf_WMA45[i+1]) && (buf_RSI[i] > buf_WMA45[i]);
+    const bool crossDown = (buf_RSI[i+1] >= buf_WMA45[i+1]) && (buf_RSI[i] < buf_WMA45[i]);
+    if (!crossUp && !crossDown) continue;
+
+    const bool ema9BelowWma  = (buf_EMA9[i] < buf_WMA45[i]);
+    const bool ema9AboveWma = (buf_EMA9[i] > buf_WMA45[i]);
+
+    const int persistN = MathMax(1, InpEma9PersistBars);
+    bool ema9PersistBelow = ema9BelowWma;
+    bool ema9PersistAbove = ema9AboveWma;
+    if (persistN > 1)
+    {
+      if (i + persistN - 1 >= rates_total)
+      {
+        ema9PersistBelow = false;
+        ema9PersistAbove = false;
+      }
+      else
+      {
+        for (int k = 1; k < persistN; k++)
+        {
+          if (buf_EMA9[i+k] >= buf_WMA45[i+k]) ema9PersistBelow = false;
+          if (buf_EMA9[i+k] <= buf_WMA45[i+k]) ema9PersistAbove = false;
+          if (!ema9PersistBelow && !ema9PersistAbove) break;
+        }
+      }
+    }
+
+    const bool ema9SlopeUp   = (buf_EMA9[i] > buf_EMA9[i+1]);
+    const bool ema9SlopeDown = (buf_EMA9[i] < buf_EMA9[i+1]);
+    const bool rsiOkBuy     = (buf_RSI[i] < InpRSIOverbought);
+    const bool rsiOkSell    = (buf_RSI[i] > InpRSIOversold);
+
+    const bool validBuy  = crossUp   && trendUp   && ema9PersistBelow && ema9SlopeUp   && rsiOkBuy;
+    const bool validSell = crossDown && trendDown && ema9PersistAbove && ema9SlopeDown && rsiOkSell;
+    if (!validBuy && !validSell) continue;
+
+    const string arrowName = OBJ_PREFIX + "CR_" + IntegerToString((int)timeArr[i]);
+    if (ObjectFind(ch, arrowName) >= 0) continue;
+
+    if (validBuy)
+    {
+      buf_Signal[i] = 1.0;
+      const double price = lowArr[i] - arrowOffset;
+      ObjectCreate(ch, arrowName, OBJ_ARROW, 0, timeArr[i], price);
+      ObjectSetInteger(ch, arrowName, OBJPROP_ARROWCODE,  233);
+      ObjectSetInteger(ch, arrowName, OBJPROP_ANCHOR,     ANCHOR_TOP);
+      ObjectSetInteger(ch, arrowName, OBJPROP_COLOR,      InpArrowUpColor);
+      ObjectSetInteger(ch, arrowName, OBJPROP_WIDTH,      InpArrowSize);
+      ObjectSetInteger(ch, arrowName, OBJPROP_SELECTABLE, false);
+      ObjectSetInteger(ch, arrowName, OBJPROP_HIDDEN,     true);
+      ObjectSetString (ch, arrowName, OBJPROP_TOOLTIP, "BUY (EA)");
+    }
+    else
+    {
+      buf_Signal[i] = -1.0;
+      const double price = highArr[i] + arrowOffset;
+      ObjectCreate(ch, arrowName, OBJ_ARROW, 0, timeArr[i], price);
+      ObjectSetInteger(ch, arrowName, OBJPROP_ARROWCODE,  234);
+      ObjectSetInteger(ch, arrowName, OBJPROP_ANCHOR,     ANCHOR_BOTTOM);
+      ObjectSetInteger(ch, arrowName, OBJPROP_COLOR,      InpArrowDownColor);
+      ObjectSetInteger(ch, arrowName, OBJPROP_WIDTH,      InpArrowSize);
+      ObjectSetInteger(ch, arrowName, OBJPROP_SELECTABLE, false);
+      ObjectSetInteger(ch, arrowName, OBJPROP_HIDDEN,     true);
+      ObjectSetString (ch, arrowName, OBJPROP_TOOLTIP, "SELL (EA)");
+    }
+  }
+}
+
+//+------------------------------------------------------------------+
+void Diagnostics_FirstPass(const int rates_total, const int copyN, const int trendN,
+                           const int need, const double &closeArr[])
+{
+  static bool firstSuccess = false;
+  if (firstSuccess || copyN < rates_total) return;
+  firstSuccess = true;
+
+  int upCount = 0, downCount = 0, rangeCount = 0, zeroEma = 0;
+  const int n = MathMin(500, rates_total - 2);
+  for (int i = 1; i <= n; i++)
+  {
+    if (buf_EMA200[i] <= 0.0) zeroEma++;
+    if      (buf_Trend[i] >  0.5) upCount++;
+    else if (buf_Trend[i] < -0.5) downCount++;
+    else                          rangeCount++;
+  }
+  PrintFormat("[RsiMomEA] First-pass OK rates_total=%d copyN=%d trendN=%d need=%d", rates_total, copyN, trendN, need);
+  PrintFormat("[RsiMomEA]   bar1: RSI=%.2f EMA9=%.2f WMA45=%.2f EMA200=%.5f Trend=%.0f Signal=%.0f close[1]=%.5f",
+              buf_RSI[1], buf_EMA9[1], buf_WMA45[1], buf_EMA200[1], buf_Trend[1], buf_Signal[1], closeArr[1]);
+  PrintFormat("[RsiMomEA]   last %d bars trend dist: UP=%d DOWN=%d RANGE=%d (zeroEma200=%d)",
+              n, upCount, downCount, rangeCount, zeroEma);
+}
+
+//+------------------------------------------------------------------+
+void EnsureBuffers(const int rates_total)
+{
+  if (rates_total <= 0) return;
+  ArrayResize(buf_RSI,    rates_total);
+  ArrayResize(buf_EMA9, rates_total);
+  ArrayResize(buf_WMA45,rates_total);
+  ArrayResize(buf_Signal,rates_total);
+  ArrayResize(buf_EMA200,rates_total);
+  ArrayResize(buf_Trend, rates_total);
+  ArraySetAsSeries(buf_RSI,    true);
+  ArraySetAsSeries(buf_EMA9,   true);
+  ArraySetAsSeries(buf_WMA45,  true);
+  ArraySetAsSeries(buf_Signal, true);
+  ArraySetAsSeries(buf_EMA200, true);
+  ArraySetAsSeries(buf_Trend,  true);
+}
+
+//+------------------------------------------------------------------+
+int RsiMomentum_OnCalculate(const int rates_total, const int prev_calculated)
+{
+  const int minBars = InpWMA45Period + InpRSIPeriod + 5;
+  if (rates_total < minBars) return 0;
+
+  EnsureBuffers(rates_total);
+
+  const int rsiBars    = BarsCalculated(h_RSI);
+  const int ema9Bars   = BarsCalculated(h_EMA9);
+  const int wmaBars    = BarsCalculated(h_WMA45);
+  const int ema200Bars = BarsCalculated(h_EMA200);
+  if (rsiBars <= 0 || ema9Bars <= 0 || wmaBars <= 0 || ema200Bars <= 0)
+  {
+    static datetime lastWarn = 0;
+    if (TimeCurrent() - lastWarn > 30)
+    {
+      PrintFormat("[RsiMomEA] Source not ready: RSI=%d EMA9=%d WMA45=%d EMA200=%d (rates=%d)",
+                  rsiBars, ema9Bars, wmaBars, ema200Bars, rates_total);
+      lastWarn = TimeCurrent();
+    }
+    return 0;
+  }
+
+  const int srcMin = MathMin(MathMin(MathMin(rsiBars, ema9Bars), wmaBars), ema200Bars);
+  const int copyN  = MathMin(srcMin, rates_total);
+  if (copyN < minBars) return 0;
+
+  if (CopyBuffer(h_RSI,   0, 0, copyN, buf_RSI)    <= 0) return 0;
+  if (CopyBuffer(h_EMA9,  0, 0, copyN, buf_EMA9)   <= 0) return 0;
+  if (CopyBuffer(h_WMA45, 0, 0, copyN, buf_WMA45)  <= 0) return 0;
+
+  int barsToScan = (prev_calculated == 0)
+                   ? rates_total - 2
+                   : (rates_total - prev_calculated + 2);
+  barsToScan = MathMin(barsToScan, rates_total - 2);
+
+  const int trendN = MathMax(1, InpTrendConfirmBars);
+  const int need   = MathMin(barsToScan + 2 + trendN, copyN);
+
+  datetime timeArr[];
+  double   highArr[], lowArr[], closeArr[], ema200Arr[];
+  ArraySetAsSeries(timeArr,   true);
+  ArraySetAsSeries(highArr,   true);
+  ArraySetAsSeries(lowArr,    true);
+  ArraySetAsSeries(closeArr,  true);
+  ArraySetAsSeries(ema200Arr, true);
+
+  if (CopyTime  (_Symbol, _Period, 0, need, timeArr)   < need) return prev_calculated;
+  if (CopyHigh  (_Symbol, _Period, 0, need, highArr)   < need) return prev_calculated;
+  if (CopyLow   (_Symbol, _Period, 0, need, lowArr)    < need) return prev_calculated;
+  if (CopyClose (_Symbol, _Period, 0, need, closeArr) < need) return prev_calculated;
+  if (CopyBuffer(h_EMA200, 0, 0, need, ema200Arr)      < need) return prev_calculated;
+
+  SignalScan_Run(barsToScan, rates_total, need, trendN, timeArr, highArr, lowArr, closeArr, ema200Arr);
+  Alerts_CheckAndFire(timeArr, closeArr, ema200Arr, need, rates_total);
+  Panel_Update(closeArr, ema200Arr, trendN, rates_total);
+
+  ChartRedraw(ActChart());
+  Diagnostics_FirstPass(rates_total, copyN, trendN, need, closeArr);
+
+  return copyN;
+}
+
+//+------------------------------------------------------------------+
+int OnInit()
+{
+  g_lastAlertBuyBar  = 0;
+  g_lastAlertSellBar = 0;
+  g_firstCalc        = true;
+  g_prevCalculated   = 0;
+
+  if (!Handles_CreateAll())
+    return INIT_FAILED;
+
+  Panel_CreateAll();
+  Print("[RsiMomEA] Init OK — logic nhúng, prefix object: ", OBJ_PREFIX);
+  return INIT_SUCCEEDED;
+}
+
+//+------------------------------------------------------------------+
+void OnDeinit(const int reason)
+{
+  Handles_ReleaseAll();
+  ObjectsDeleteAll(ActChart(), OBJ_PREFIX);
+  ChartRedraw(ActChart());
+}
+
+//+------------------------------------------------------------------+
+void OnTick()
+{
+  const int rates_total = Bars(_Symbol, _Period);
+  const int ret = RsiMomentum_OnCalculate(rates_total, g_prevCalculated);
+  if (ret != 0)
+    g_prevCalculated = ret;
+}
+
+//+------------------------------------------------------------------+
diff --git a/Indicators/RsiMomentumIndicator/Lib/Handles.mqh b/Indicators/RsiMomentumIndicator/Lib/Handles.mqh
index 0c12583..8da5b1a 100644
--- a/Indicators/RsiMomentumIndicator/Lib/Handles.mqh
+++ b/Indicators/RsiMomentumIndicator/Lib/Handles.mqh
@@ -1,8 +1,7 @@
 //+------------------------------------------------------------------+
 //| Handles.mqh                                                      |
-//| Tạo / giải phóng indicator handles (RSI, EMA9/RSI, WMA45/RSI,    |
-//| EMA200). EMA200 chỉ dùng qua CopyBuffer — không ChartIndicatorAdd |
-//| (tránh ERR_CHART_INDICATOR_CANNOT_ADD trong Tester / iCustom).  |
+//| Tạo / giải phóng handle RSI, EMA9/WMA45 trên RSI, EMA200(close). |
+//| EMA200 chỉ CopyBuffer — không ChartIndicatorAdd.               |
 //+------------------------------------------------------------------+
 #ifndef RSIMOM_HANDLES_MQH
 #define RSIMOM_HANDLES_MQH
diff --git a/Indicators/RsiMomentumIndicator/Lib/SignalScan.mqh b/Indicators/RsiMomentumIndicator/Lib/SignalScan.mqh
index bda87bb..b8d39d7 100644
--- a/Indicators/RsiMomentumIndicator/Lib/SignalScan.mqh
+++ b/Indicators/RsiMomentumIndicator/Lib/SignalScan.mqh
@@ -12,8 +12,8 @@
 #define RSIMOM_SIGNALSCAN_MQH
 
 //+------------------------------------------------------------------+
-//| Quét signal từ bar `barsToScan` về bar 1, ghi vào buf_Signal /    |
-//| buf_Trend / buf_EMA200 và tạo OBJ_ARROW khi có tín hiệu hợp lệ.   |
+//| Quét signal từ bar `barsToScan` về bar 1, ghi mảng nội bộ         |
+//| buf_Signal / buf_Trend / buf_EMA200 + vẽ OBJ_ARROW.              |
 //+------------------------------------------------------------------+
 void SignalScan_Run(const int barsToScan,
                     const int rates_total,
@@ -118,7 +118,7 @@ void SignalScan_Run(const int barsToScan,
 
     if (validBuy)
     {
-      buf_Signal[i] = 1.0; // ghi tín hiệu cho EA đọc qua iCustom
+      buf_Signal[i] = 1.0;
 
       // Mũi tên lên (↑) đặt dưới đáy nến — tín hiệu BUY trong uptrend
       // ANCHOR_TOP: điểm anchor là đỉnh icon → arrow nằm xuôi xuống dưới price
@@ -138,7 +138,7 @@ void SignalScan_Run(const int barsToScan,
     }
     else // validSell
     {
-      buf_Signal[i] = -1.0; // ghi tín hiệu cho EA đọc qua iCustom
+      buf_Signal[i] = -1.0;
 
       // Mũi tên xuống (↓) đặt trên đỉnh nến — tín hiệu SELL trong downtrend
       // ANCHOR_BOTTOM: điểm anchor là đáy icon → arrow nằm ngược lên trên price
diff --git a/Indicators/RsiMomentumIndicator/Lib/State.mqh b/Indicators/RsiMomentumIndicator/Lib/State.mqh
index 4b8978c..7eac16f 100644
--- a/Indicators/RsiMomentumIndicator/Lib/State.mqh
+++ b/Indicators/RsiMomentumIndicator/Lib/State.mqh
@@ -1,20 +1,20 @@
 //+------------------------------------------------------------------+
 //| State.mqh                                                        |
-//| Toàn bộ biến global: indicator buffers, handles, hằng số,        |
-//| state notification. KHÔNG chứa logic — chỉ khai báo.             |
+//| Buffer plot (RSI, EMA9, WMA45) + mảng nội bộ cho alert/diag.    |
+//| KHÔNG chứa logic — chỉ khai báo.                                 |
 //+------------------------------------------------------------------+
 #ifndef RSIMOM_STATE_MQH
 #define RSIMOM_STATE_MQH
 
 //+------------------------------------------------------------------+
-//| Indicator buffers                                                |
+//| Buffers hiển thị (plot) + mảng làm việc nội bộ                  |
 //+------------------------------------------------------------------+
 double buf_RSI[];
 double buf_EMA9[];
 double buf_WMA45[];
-double buf_Signal[];   // hidden — +1 BUY, -1 SELL, 0 none
-double buf_EMA200[];   // hidden — giá trị EMA200 (cho EA hiển thị)
-double buf_Trend[];    // hidden — +1 UP, -1 DOWN, 0 RANGE/SWITCHING
+double buf_Signal[];   // nội bộ — +1 BUY, -1 SELL, 0 none (Alerts)
+double buf_EMA200[];   // nội bộ — snapshot EMA200 theo bar (diag)
+double buf_Trend[];    // nội bộ — +1 UP, -1 DOWN, 0 RANGE (diag)
 
 //+------------------------------------------------------------------+
 //| Indicator handles                                                |
diff --git a/Indicators/RsiMomentumIndicator/RsiMomentumIndicator.ex5 b/Indicators/RsiMomentumIndicator/RsiMomentumIndicator.ex5
index 70b7760..cf77538 100644
Binary files a/Indicators/RsiMomentumIndicator/RsiMomentumIndicator.ex5 and b/Indicators/RsiMomentumIndicator/RsiMomentumIndicator.ex5 differ
diff --git a/Indicators/RsiMomentumIndicator/RsiMomentumIndicator.mq5 b/Indicators/RsiMomentumIndicator/RsiMomentumIndicator.mq5
index 8c5b31a..8b95bab 100644
--- a/Indicators/RsiMomentumIndicator/RsiMomentumIndicator.mq5
+++ b/Indicators/RsiMomentumIndicator/RsiMomentumIndicator.mq5
@@ -1,8 +1,7 @@
 //+------------------------------------------------------------------+
 //| RsiMomentumIndicator.mq5                                         |
-//| Hiển thị trong cửa sổ phụ: RSI14, EMA9(RSI), WMA45(RSI)         |
-//| Trên chart chính: mũi tên giao cắt (EMA200 chỉ tính nội bộ).     |
-//| Panel góc trên-phải: trend, giá trị RSI / EMA9 / WMA45           |
+//| Chỉ để hiển thị + trade thủ công: cửa sổ phụ RSI/EMA9/WMA45,     |
+//| mũi tên + panel + cảnh báo entry. Không export buffer cho EA.   |
 //|                                                                  |
 //| Source code được tách thành các module trong thư mục Lib/:       |
 //|   Inputs.mqh       — input parameters                            |
@@ -14,9 +13,9 @@
 //|   Diagnostics.mqh  — log chẩn đoán lần đầu                       |
 //+------------------------------------------------------------------+
 #property copyright   "RsiMomentumIndicator"
-#property version     "1.10"
+#property version     "1.20"
 #property indicator_separate_window
-#property indicator_buffers 6
+#property indicator_buffers 3
 #property indicator_plots   3
 #property indicator_minimum 0
 #property indicator_maximum 100
@@ -67,9 +66,6 @@ int OnInit()
   SetIndexBuffer(0, buf_RSI,    INDICATOR_DATA);
   SetIndexBuffer(1, buf_EMA9,   INDICATOR_DATA);
   SetIndexBuffer(2, buf_WMA45,  INDICATOR_DATA);
-  SetIndexBuffer(3, buf_Signal, INDICATOR_CALCULATIONS); // ẩn — phục vụ EA
-  SetIndexBuffer(4, buf_EMA200, INDICATOR_CALCULATIONS); // ẩn — EMA200 cho EA
-  SetIndexBuffer(5, buf_Trend,  INDICATOR_CALCULATIONS); // ẩn — trend cho EA
 
   ArraySetAsSeries(buf_RSI,    true);
   ArraySetAsSeries(buf_EMA9,   true);
@@ -117,6 +113,14 @@ int OnCalculate(const int rates_total,
   const int minBars = InpWMA45Period + InpRSIPeriod + 5;
   if (rates_total < minBars) return 0;
 
+  // Mảng nội bộ (alert / diagnostics) — không bind buffer nên tự resize
+  ArrayResize(buf_Signal, rates_total);
+  ArrayResize(buf_EMA200, rates_total);
+  ArrayResize(buf_Trend,  rates_total);
+  ArraySetAsSeries(buf_Signal, true);
+  ArraySetAsSeries(buf_EMA200, true);
+  ArraySetAsSeries(buf_Trend,  true);
+
   // Đảm bảo các source indicator đã tính xong (quan trọng khi cold-start
   // hoặc khi thị trường đóng — không có tick để retry)
   const int rsiBars    = BarsCalculated(h_RSI);
@@ -136,7 +140,7 @@ int OnCalculate(const int rates_total,
   }
 
   // Chỉ copy số bar mà TẤT CẢ source (incl. EMA200) đã tính xong
-  // → tránh CopyBuffer EMA200 fail giữa chừng làm buf_EMA200/buf_Trend stale
+  // → tránh CopyBuffer EMA200 fail giữa chừng làm mảng nội bộ stale
   const int srcMin = MathMin(MathMin(MathMin(rsiBars, ema9Bars), wmaBars), ema200Bars);
   const int copyN  = MathMin(srcMin, rates_total);
   if (copyN < minBars) return 0;
diff --git a/Profiles/Charts/Default/order.wnd b/Profiles/Charts/Default/order.wnd
index bfaa30c..b8497ed 100644
Binary files a/Profiles/Charts/Default/order.wnd and b/Profiles/Charts/Default/order.wnd differ