diff --git a/Classes/x-saherelm.x121.setup.class.mq5 b/Classes/x-saherelm.x121.setup.class.mq5
index 387c43a3..57b72d5d 100644
--- a/Classes/x-saherelm.x121.setup.class.mq5
+++ b/Classes/x-saherelm.x121.setup.class.mq5
@@ -3684,10 +3684,20 @@ struct X121SignalGenerator
                     //
                     ||
                     //
-                    (conditions.ichConditions.isClosedUnderKijunSen &&
-                     conditions.ichConditions.isTenkanSenUnderKijunSen &&
-                     conditions.ichConditions.isSenkouSpanAUnderB &&
-                     conditions.ichConditions.isSenkouSpanAOverLast)
+                    ((conditions.ichConditions.isClosedUnderKijunSen &&
+                      conditions.ichConditions.isTenkanSenUnderKijunSen) &&
+                     (
+                         //
+                         conditions.ichConditions.isSenkouSpanAOverB
+                         //
+                         ||
+                         //
+                         (conditions.ichConditions.isSenkouSpanAUnderB &&
+                          conditions.ichConditions.isSenkouSpanAOverLast)
+                         //
+                         )
+                     //
+                     )
                     //
                     ||
                     //
@@ -3698,6 +3708,25 @@ struct X121SignalGenerator
                      conditions.ichConditions.isSenkouSpanAOverLast &&
                      conditions.ichConditions.isSenkouSpanACrossedOverLast)
                     //
+                    ||
+                    //
+                    ((conditions.ichConditions.isTenkanSenUnderKijunSen &&
+                      conditions.ichConditions.isClosedUnderKijunSen) &&
+                     //
+                     (
+                         //
+                         conditions.ichConditions.isSenkouSpanAOverB
+                         //
+                         ||
+                         //
+                         (conditions.ichConditions.isFutureSenkouSpanAUnderB &&
+                          conditions.ichConditions.isSenkouSpanACrossedOverB &&
+                          conditions.ichConditions.isFutureSenkouSpanAUnderLast)
+                         //
+                         )
+                     //
+                     )
+                    //
                     )
                 //
                 ||
@@ -3724,18 +3753,53 @@ struct X121SignalGenerator
                         //
                         (
                             //
-                            (!conditions.pvConditions.isMCBearish ||
-                             !conditions.pvConditions.isMCHHBearish)
+                            (
+                                //
+                                (!conditions.pvConditions.isMCBearish ||
+                                 !conditions.pvConditions.isMCHHBearish)
+                                //
+                                &&
+                                //
+                                (!conditions.pvConditions.isLCBearish ||
+                                 !conditions.pvConditions.isLCHHBearish)
+                                //
+                                &&
+                                //
+                                (!conditions.pvConditions.isHCBearish ||
+                                 !conditions.pvConditions.isHCHHBearish)
+                                //
+                                )
                             //
-                            &&
+                            ||
                             //
-                            (!conditions.pvConditions.isLCBearish ||
-                             !conditions.pvConditions.isLCHHBearish)
-                            //
-                            &&
-                            //
-                            (!conditions.pvConditions.isHCBearish ||
-                             !conditions.pvConditions.isHCHHBearish)
+                            (
+                                //
+                                conditions.pvConditions.isSCBearish &&
+                                conditions.pvConditions.isMCBearish &&
+                                conditions.pvConditions.isSCHHBearish &&
+                                conditions.pvConditions.isSCLLBearish &&
+                                conditions.pvConditions.isMCHHBearish &&
+                                conditions.pvConditions.isMCLLBearish &&
+                                conditions.pvConditions.isLCLLBearish &&
+                                conditions.pvConditions.isHCLLBearish &&
+                                conditions.pvConditions.isSCSwitchedToBearish &&
+                                conditions.pvConditions.isMCSwitchedToBearish &&
+                                conditions.pvConditions.isLCSwitchedToBearish &&
+                                conditions.pvConditions.isHCSwitchedToBearish &&
+                                conditions.pvConditions.isSCLLSwitchedToBeraish &&
+                                conditions.pvConditions.isMCLLSwitchedToBeraish &&
+                                conditions.pvConditions.isLCLLSwitchedToBeraish &&
+                                conditions.pvConditions.isHCLLSwitchedToBeraish &&
+                                //
+                                !conditions.pvConditions.isLCBearish &&
+                                !conditions.pvConditions.isHCBearish &&
+                                !conditions.pvConditions.isLCHHBearish &&
+                                !conditions.pvConditions.isHCHHBearish &&
+                                !conditions.pvConditions.isMCHHSwitchedToBearish &&
+                                !conditions.pvConditions.isLCHHSwitchedToBearish &&
+                                !conditions.pvConditions.isHCHHSwitchedToBearish
+                                //
+                                )
                             //
                             )
                         //
@@ -3752,26 +3816,42 @@ struct X121SignalGenerator
                             conditions.pvConditions.isCloseOverFib3 &&
                             conditions.pvConditions.isCloseOverFib4 &&
                             conditions.pvConditions.isCloseOverFib5 &&
-                            //
-                            !conditions.pvConditions.isNewVale &&
-                            !conditions.pvConditions.isNewValeOverLast &&
-                            !conditions.pvConditions.isNewValeUnderLast &&
-                            !conditions.pvConditions.isFiboIncreased &&
-                            !conditions.pvConditions.isFiboDecreased &&
-                            !conditions.pvConditions.isFiboSectionChanged &&
-                            //
-                            !conditions.pvConditions.isSCBearish &&
-                            !conditions.pvConditions.isSCHHBearish &&
-                            !conditions.pvConditions.isSCLLBearish &&
-                            !conditions.pvConditions.isMCBearish &&
-                            !conditions.pvConditions.isMCHHBearish &&
-                            !conditions.pvConditions.isMCLLBearish &&
-                            !conditions.pvConditions.isLCBearish &&
-                            !conditions.pvConditions.isLCHHBearish &&
-                            !conditions.pvConditions.isLCLLBearish &&
-                            !conditions.pvConditions.isHCBearish &&
-                            !conditions.pvConditions.isHCHHBearish &&
-                            !conditions.pvConditions.isHCLLBearish
+                            (
+                                //
+                                (
+                                    //
+                                    !conditions.pvConditions.isNewVale &&
+                                    !conditions.pvConditions.isNewValeOverLast &&
+                                    !conditions.pvConditions.isNewValeUnderLast &&
+                                    !conditions.pvConditions.isFiboIncreased &&
+                                    !conditions.pvConditions.isFiboDecreased &&
+                                    !conditions.pvConditions.isFiboSectionChanged &&
+                                    //
+                                    !conditions.pvConditions.isSCBearish &&
+                                    !conditions.pvConditions.isSCHHBearish &&
+                                    !conditions.pvConditions.isSCLLBearish &&
+                                    !conditions.pvConditions.isMCBearish &&
+                                    !conditions.pvConditions.isMCHHBearish &&
+                                    !conditions.pvConditions.isMCLLBearish &&
+                                    !conditions.pvConditions.isLCBearish &&
+                                    !conditions.pvConditions.isLCHHBearish &&
+                                    !conditions.pvConditions.isLCLLBearish &&
+                                    !conditions.pvConditions.isHCBearish &&
+                                    !conditions.pvConditions.isHCHHBearish &&
+                                    !conditions.pvConditions.isHCLLBearish
+                                    //
+                                    )
+                                //
+                                ||
+                                //
+                                (
+                                    //
+                                    conditions.pvConditions.isSCHHBullish &&
+                                    conditions.pvConditions.isMCHHBullish
+                                    //
+                                    )
+                                //
+                                )
                             //
                             )
                         //