diff --git a/src/strategy/shaman/HealShamanStrategy.cpp b/src/strategy/shaman/HealShamanStrategy.cpp
index 6917cc89..1a9bd811 100644
--- a/src/strategy/shaman/HealShamanStrategy.cpp
+++ b/src/strategy/shaman/HealShamanStrategy.cpp
@@ -49,19 +49,19 @@ void HealShamanStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
         
     triggers.push_back(new TriggerNode(
         "party member critical health",
-		NextAction::array(0, new NextAction("riptide on party", 24.0f), new NextAction("healing wave on party", 23.0f), NULL)));
+		NextAction::array(0, new NextAction("riptide on party", 24.0f), new NextAction("lesser healing wave on party", 23.0f), nullptr)));
 
     triggers.push_back(new TriggerNode(
         "party member low health",
-		NextAction::array(0, new NextAction("riptide on party", 18.0f), new NextAction("healing wave on party", 17.0f), NULL)));
+		NextAction::array(0, new NextAction("riptide on party", 18.0f), new NextAction("lesser healing wave on party", 17.0f), nullptr)));
 
 	triggers.push_back(new TriggerNode(
         "party member medium health",
-		NextAction::array(0, new NextAction("riptide on party", 15.0f), new NextAction("lesser healing wave on party", 14.0f), NULL)));
+		NextAction::array(0, new NextAction("riptide on party", 15.0f), new NextAction("lesser healing wave on party", 14.0f), nullptr)));
     
     triggers.push_back(new TriggerNode(
         "party member almost full health",
-		NextAction::array(0, new NextAction("riptide on party", 12.0f), new NextAction("lesser healing wave on party", 11.0f), NULL)));
+		NextAction::array(0, new NextAction("riptide on party", 12.0f), nullptr)));
     
     triggers.push_back(new TriggerNode(
         "party member cleanse spirit poison",
@@ -85,9 +85,9 @@ void HealShamanStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
     //     "no fire totem",
     //     NextAction::array(0, new NextAction("flametongue totem", 10.0f), NULL)));
 
-    triggers.push_back(new TriggerNode(
-        "no water totem",
-        NextAction::array(0, new NextAction("healing stream totem", 13.0f), NULL)));
+    // triggers.push_back(new TriggerNode(
+    //     "no water totem",
+    //     NextAction::array(0, new NextAction("healing stream totem", 13.0f), NULL)));
     
     triggers.push_back(new TriggerNode(
         "earth shield on main tank",
diff --git a/src/strategy/shaman/ShamanActions.h b/src/strategy/shaman/ShamanActions.h
index 630c35d8..24226b7a 100644
--- a/src/strategy/shaman/ShamanActions.h
+++ b/src/strategy/shaman/ShamanActions.h
@@ -147,7 +147,7 @@ class CastStrengthOfEarthTotemAction : public CastTotemAction
 class CastManaSpringTotemAction : public CastTotemAction
 {
     public:
-        CastManaSpringTotemAction(PlayerbotAI* botAI) : CastTotemAction(botAI, "mana spring totem", "mana spring", 20.0f) { }
+        CastManaSpringTotemAction(PlayerbotAI* botAI) : CastTotemAction(botAI, "mana spring totem", "mana spring", 0.0f) { }
 
         bool isUseful() override;
 };
diff --git a/src/strategy/shaman/ShamanNonCombatStrategy.cpp b/src/strategy/shaman/ShamanNonCombatStrategy.cpp
index 44973347..1670d288 100644
--- a/src/strategy/shaman/ShamanNonCombatStrategy.cpp
+++ b/src/strategy/shaman/ShamanNonCombatStrategy.cpp
@@ -16,19 +16,19 @@ void ShamanNonCombatStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
     triggers.push_back(new TriggerNode("water walking on party", NextAction::array(0, new NextAction("water walking on party", 11.0f), nullptr)));
     triggers.push_back(new TriggerNode(
         "party member critical health",
-        NextAction::array(0, new NextAction("healing wave on party", 27.0f), NULL)));
+        NextAction::array(0, new NextAction("riptide on party", 31.0f), new NextAction("healing wave on party", 30.0f), NULL)));
 
 	triggers.push_back(new TriggerNode(
         "party member low health",
-        NextAction::array(0, new NextAction("healing wave on party", 26.0f), NULL)));
+        NextAction::array(0, new NextAction("riptide on party", 29.0f), new NextAction("healing wave on party", 28.0f), NULL)));
 
 	triggers.push_back(new TriggerNode(
 		"party member medium health",
-		NextAction::array(0, new NextAction("healing wave on party", 25.0f), NULL)));
+		NextAction::array(0, new NextAction("riptide on party", 27.0f), new NextAction("healing wave on party", 26.0f), NULL)));
 
 	triggers.push_back(new TriggerNode(
 		"party member almost full health",
-		NextAction::array(0, new NextAction("lesser healing wave on party", 24.0f), NULL)));
+		NextAction::array(0, new NextAction("riptide on party", 25.0f), new NextAction("lesser healing wave on party", 24.0f), NULL)));
 
     triggers.push_back(new TriggerNode(
         "medium aoe heal",