diff --git a/Indicators/MyIndicators/TDI_CMO_Pro.mq5 b/Indicators/MyIndicators/TDI_CMO_Pro.mq5
new file mode 100644
index 0000000..9e54000
--- /dev/null
+++ b/Indicators/MyIndicators/TDI_CMO_Pro.mq5
@@ -0,0 +1,124 @@
+//+------------------------------------------------------------------+
+//|                                                  TDI_CMO_Pro.mq5 |
+//|                                          Copyright 2025, xxxxxxxx|
+//|                                                                  |
+//+------------------------------------------------------------------+
+#property copyright "Copyright 2025, xxxxxxxx"
+#property version   "1.00"
+#property description "Trader's Dynamic Index based on Chande Momentum Oscillator (CMO)."
+#property description "Supports Standard and Heikin Ashi sources."
+
+#property indicator_separate_window
+#property indicator_buffers 5
+#property indicator_plots   5
+#property indicator_minimum 0
+#property indicator_maximum 100
+#property indicator_level1 32.0
+#property indicator_level2 50.0
+#property indicator_level3 68.0
+#property indicator_levelstyle STYLE_DOT
+
+//--- Include the calculator engine ---
+#include <MyIncludes\TDI_CMO_Calculator.mqh>
+
+//--- Plot Properties ---
+#property indicator_label1  "Price Line"
+#property indicator_type1   DRAW_LINE
+#property indicator_color1  clrSeaGreen
+#property indicator_style1  STYLE_SOLID
+#property indicator_width1  1
+#property indicator_label2  "Signal Line"
+#property indicator_type2   DRAW_LINE
+#property indicator_color2  clrRed
+#property indicator_style2  STYLE_SOLID
+#property indicator_width2  1
+#property indicator_label3  "Base Line"
+#property indicator_type3   DRAW_LINE
+#property indicator_color3  clrOrange
+#property indicator_style3  STYLE_SOLID
+#property indicator_width3  1
+#property indicator_label4  "Upper Band"
+#property indicator_type4   DRAW_LINE
+#property indicator_color4  clrDodgerBlue
+#property indicator_style4  STYLE_DOT
+#property indicator_width4  1
+#property indicator_label5  "Lower Band"
+#property indicator_type5   DRAW_LINE
+#property indicator_color5  clrDodgerBlue
+#property indicator_style5  STYLE_DOT
+#property indicator_width5  1
+
+//--- Input Parameters ---
+input int                       InpCmoPeriod        = 13;
+input int                       InpPriceLinePeriod  = 2;
+input int                       InpSignalLinePeriod = 7;
+input int                       InpBaseLinePeriod   = 34;
+input double                    InpBandsDeviation   = 1.618;
+input ENUM_APPLIED_PRICE_HA_ALL InpSourcePrice      = PRICE_CLOSE_STD;
+
+//--- Indicator Buffers ---
+double    BufferPriceLine[], BufferSignalLine[], BufferBaseLine[], BufferUpperBand[], BufferLowerBand[];
+
+//--- Global calculator object (as a base class pointer) ---
+CTDICMOCalculator *g_calculator;
+
+//+------------------------------------------------------------------+
+//| Custom indicator initialization function.                        |
+//+------------------------------------------------------------------+
+int OnInit()
+  {
+   SetIndexBuffer(0, BufferPriceLine,  INDICATOR_DATA);
+   SetIndexBuffer(1, BufferSignalLine, INDICATOR_DATA);
+   SetIndexBuffer(2, BufferBaseLine,   INDICATOR_DATA);
+   SetIndexBuffer(3, BufferUpperBand,  INDICATOR_DATA);
+   SetIndexBuffer(4, BufferLowerBand,  INDICATOR_DATA);
+
+   ArraySetAsSeries(BufferPriceLine,  false);
+   ArraySetAsSeries(BufferSignalLine, false);
+   ArraySetAsSeries(BufferBaseLine,   false);
+   ArraySetAsSeries(BufferUpperBand,  false);
+   ArraySetAsSeries(BufferLowerBand,  false);
+
+   if(InpSourcePrice <= PRICE_HA_CLOSE)
+     {
+      g_calculator = new CTDICMOCalculator_HA();
+      IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("TDI CMO HA(%d)", InpCmoPeriod));
+     }
+   else
+     {
+      g_calculator = new CTDICMOCalculator();
+      IndicatorSetString(INDICATOR_SHORTNAME, StringFormat("TDI CMO(%d)", InpCmoPeriod));
+     }
+
+   if(CheckPointer(g_calculator) == POINTER_INVALID ||
+      !g_calculator.Init(InpCmoPeriod, InpPriceLinePeriod, InpSignalLinePeriod, InpBaseLinePeriod, InpBandsDeviation))
+     {
+      Print("Failed to initialize TDI CMO Calculator.");
+      return(INIT_FAILED);
+     }
+
+   int draw_begin = InpCmoPeriod + InpBaseLinePeriod;
+   for(int i=0; i<5; i++)
+      PlotIndexSetInteger(i, PLOT_DRAW_BEGIN, draw_begin);
+
+   return(INIT_SUCCEEDED);
+  }
+
+//+------------------------------------------------------------------+
+void OnDeinit(const int reason) { if(CheckPointer(g_calculator) != POINTER_INVALID) delete g_calculator; }
+
+//+------------------------------------------------------------------+
+int OnCalculate(const int rates_total, const int, const datetime&[], const double &open[], const double &high[], const double &low[], const double &close[], const long&[], const long&[], const int&[])
+  {
+   if(CheckPointer(g_calculator) == POINTER_INVALID)
+      return 0;
+
+   ENUM_APPLIED_PRICE price_type = (InpSourcePrice <= PRICE_HA_CLOSE) ? (ENUM_APPLIED_PRICE)(-(int)InpSourcePrice) : (ENUM_APPLIED_PRICE)InpSourcePrice;
+
+   g_calculator.Calculate(rates_total, price_type, open, high, low, close,
+                          BufferPriceLine, BufferSignalLine, BufferBaseLine, BufferUpperBand, BufferLowerBand);
+
+   return(rates_total);
+  }
+//+------------------------------------------------------------------+
+//+------------------------------------------------------------------+