diff --git a/Helpers/x-saherelm.x3vwap.helper.mq5 b/Helpers/x-saherelm.x3vwap.helper.mq5
index 5d958913..6e6ef327 100644
--- a/Helpers/x-saherelm.x3vwap.helper.mq5
+++ b/Helpers/x-saherelm.x3vwap.helper.mq5
@@ -57,9 +57,10 @@ struct X3VWAPInputs
 
     //
     // Market ...
-    int fastLength; // Fast Length
-    int midLength;  // Mid Length
-    int slowLength; // Slow Length
+    int fastLength;               // Fast Length
+    int midLength;                // Mid Length
+    int slowLength;               // Slow Length
+    ENUM_APPLIED_PRICE appliedTo; // Applied To
 
     //
     // Presentation ...
@@ -88,6 +89,7 @@ struct X3VWAPInputs
         fastLength = 0;
         midLength = 0;
         slowLength = 0;
+        appliedTo = PRICE_CLOSE;
 
         //
         showFast = false;
@@ -103,6 +105,7 @@ struct X3VWAPInputs
         fastLength = 50;
         midLength = 100;
         slowLength = 200;
+        appliedTo = PRICE_CLOSE;
 
         //
         showFast = true;
@@ -428,6 +431,7 @@ class XSCX3VWAPHelper : public XSCBaseHelper
             mInputs.fastLength,
             mInputs.midLength,
             mInputs.slowLength,
+            mInputs.appliedTo,
             //
             // Presentation ...
             "",
diff --git a/Indicators/x-saherelm.x3vwap.mq5 b/Indicators/x-saherelm.x3vwap.mq5
index 7cfceaae..8265a798 100644
--- a/Indicators/x-saherelm.x3vwap.mq5
+++ b/Indicators/x-saherelm.x3vwap.mq5
@@ -30,16 +30,14 @@
 //
 // Market ...
 input group "Market";
-input int fastLength = 50;                        // Fast Length
-input int midLength = 100;                        // Mid Length
-input int slowLength = 200;                       // Slow Length
+input int fastLength = 50;  // Fast Length
+input int midLength = 100;  // Mid Length
+input int slowLength = 200; // Slow Length
+input ENUM_APPLIED_PRICE appliedTo = PRICE_CLOSE; // Applied To
 
 //
 // Presentation ...
 input group "Presentation";
-
-//
-// Parts ...
 input bool showFast = true; // Show Fast
 input bool showMid = true;  // Show Mid
 input bool showSlow = true; // Show Slow
diff --git a/X121SMCEA/Helpers/x-saherelm.x3vwap.helper.mq5 b/X121SMCEA/Helpers/x-saherelm.x3vwap.helper.mq5
index 5d958913..6e6ef327 100644
--- a/X121SMCEA/Helpers/x-saherelm.x3vwap.helper.mq5
+++ b/X121SMCEA/Helpers/x-saherelm.x3vwap.helper.mq5
@@ -57,9 +57,10 @@ struct X3VWAPInputs
 
     //
     // Market ...
-    int fastLength; // Fast Length
-    int midLength;  // Mid Length
-    int slowLength; // Slow Length
+    int fastLength;               // Fast Length
+    int midLength;                // Mid Length
+    int slowLength;               // Slow Length
+    ENUM_APPLIED_PRICE appliedTo; // Applied To
 
     //
     // Presentation ...
@@ -88,6 +89,7 @@ struct X3VWAPInputs
         fastLength = 0;
         midLength = 0;
         slowLength = 0;
+        appliedTo = PRICE_CLOSE;
 
         //
         showFast = false;
@@ -103,6 +105,7 @@ struct X3VWAPInputs
         fastLength = 50;
         midLength = 100;
         slowLength = 200;
+        appliedTo = PRICE_CLOSE;
 
         //
         showFast = true;
@@ -428,6 +431,7 @@ class XSCX3VWAPHelper : public XSCBaseHelper
             mInputs.fastLength,
             mInputs.midLength,
             mInputs.slowLength,
+            mInputs.appliedTo,
             //
             // Presentation ...
             "",
diff --git a/X121SMCEA/Indicators/x-saherelm.x3vwap.mq5 b/X121SMCEA/Indicators/x-saherelm.x3vwap.mq5
index 549040af..8265a798 100644
--- a/X121SMCEA/Indicators/x-saherelm.x3vwap.mq5
+++ b/X121SMCEA/Indicators/x-saherelm.x3vwap.mq5
@@ -30,19 +30,14 @@
 //
 // Market ...
 input group "Market";
-input int fastLength = 50;                        // Fast Length
-input int midLength = 100;                        // Mid Length
-input int slowLength = 200;                       // Slow Length
-input int shiftLength = 0;                        // Shift
-input ENUM_MA_METHOD method = MODE_SMA;           // Mode
+input int fastLength = 50;  // Fast Length
+input int midLength = 100;  // Mid Length
+input int slowLength = 200; // Slow Length
 input ENUM_APPLIED_PRICE appliedTo = PRICE_CLOSE; // Applied To
 
 //
 // Presentation ...
 input group "Presentation";
-
-//
-// Parts ...
 input bool showFast = true; // Show Fast
 input bool showMid = true;  // Show Mid
 input bool showSlow = true; // Show Slow
diff --git a/X121SMCEA/Strategy/x-121.smc.test.strategy.class.mq5 b/X121SMCEA/Strategy/x-121.smc.test.strategy.class.mq5
index d5b7b6f7..fc7b5fb3 100644
Binary files a/X121SMCEA/Strategy/x-121.smc.test.strategy.class.mq5 and b/X121SMCEA/Strategy/x-121.smc.test.strategy.class.mq5 differ