Update default scripts to SimulationCraft git master from 2014-12-10.

diff --git a/scripts/ovale_shaman.lua b/scripts/ovale_shaman.lua
index 6ccf4ec..5829b59 100644
--- a/scripts/ovale_shaman.lua
+++ b/scripts/ovale_shaman.lua
@@ -269,7 +269,7 @@ AddIcon specialization=elemental help=cd checkbox=opt_shaman_elemental_aoe
 # Based on SimulationCraft profile "Shaman_Enhancement_T17M".
 #	class=shaman
 #	spec=enhancement
-#	talents=0002012
+#	talents=0001023
 #	glyphs=chain_lightning/frost_shock

 # ActionList: EnhancementDefaultActions --> main, shortcd, cd
@@ -405,10 +405,10 @@ AddFunction EnhancementSingleActions
 	if Talent(unleashed_fury_talent) or ArmorSetBonus(T16_melee 2) == 1 Spell(unleash_elements)
 	#elemental_blast,if=buff.maelstrom_weapon.react>=4|buff.ancestral_swiftness.up
 	if BuffStacks(maelstrom_weapon_buff) >= 4 or BuffPresent(ancestral_swiftness_buff) Spell(elemental_blast)
-	#lightning_bolt,if=buff.maelstrom_weapon.react=5|(buff.maelstrom_weapon.react>=4&!buff.ascendance.up)|(buff.ancestral_swiftness.up&buff.maelstrom_weapon.react>=3)
-	if BuffStacks(maelstrom_weapon_buff) == 5 or BuffStacks(maelstrom_weapon_buff) >= 4 and not BuffPresent(ascendance_melee_buff) or BuffPresent(ancestral_swiftness_buff) and BuffStacks(maelstrom_weapon_buff) >= 3 Spell(lightning_bolt)
 	#windstrike
 	if BuffPresent(ascendance_melee_buff) Spell(windstrike)
+	#lightning_bolt,if=buff.maelstrom_weapon.react=5
+	if BuffStacks(maelstrom_weapon_buff) == 5 Spell(lightning_bolt)
 	#stormstrike
 	Spell(stormstrike)
 	#lava_lash
@@ -421,8 +421,8 @@ AddFunction EnhancementSingleActions
 	if Talent(elemental_fusion_talent) and target.DebuffRemaining(flame_shock_debuff) >= 16 or not Talent(elemental_fusion_talent) Spell(frost_shock)
 	#elemental_blast,if=buff.maelstrom_weapon.react>=1
 	if BuffStacks(maelstrom_weapon_buff) >= 1 Spell(elemental_blast)
-	#lightning_bolt,if=buff.maelstrom_weapon.react>=1&!buff.ascendance.up
-	if BuffStacks(maelstrom_weapon_buff) >= 1 and not BuffPresent(ascendance_melee_buff) Spell(lightning_bolt)
+	#lightning_bolt,if=(buff.maelstrom_weapon.react>=1&!buff.ascendance.up)|buff.ancestral_swiftness.up
+	if BuffStacks(maelstrom_weapon_buff) >= 1 and not BuffPresent(ascendance_melee_buff) or BuffPresent(ancestral_swiftness_buff) Spell(lightning_bolt)
 	#searing_totem,if=pet.searing_totem.remains<=20&!pet.fire_elemental_totem.active&!buff.liquid_magma.up
 	if TotemRemaining(fire totem=searing_totem) <= 20 and not TotemPresent(fire totem=fire_elemental_totem) and not BuffPresent(liquid_magma_buff) Spell(searing_totem)
 }
diff --git a/scripts/ovale_warrior.lua b/scripts/ovale_warrior.lua
index 1305636..5d71535 100644
--- a/scripts/ovale_warrior.lua
+++ b/scripts/ovale_warrior.lua
@@ -130,8 +130,8 @@ AddFunction ArmsAoeShortCdActions
 	{
 		#ravager,if=buff.bloodbath.up|!talent.bloodbath.enabled
 		if BuffPresent(bloodbath_buff) or not Talent(bloodbath_talent) Spell(ravager)
-		#bladestorm,if=active_enemies>5
-		if Enemies() > 5 Spell(bladestorm)
+		#bladestorm
+		Spell(bladestorm)

 		unless target.DebuffPresent(rend_debuff) and Spell(colossus_smash)
 			or SpellCooldown(colossus_smash) > 1.5 and target.HealthPercent() > 20 and Enemies() == 2 and Spell(mortal_strike)
@@ -143,8 +143,6 @@ AddFunction ArmsAoeShortCdActions
 			unless SpellCooldown(colossus_smash) > 1.5 and { target.HealthPercent() > 20 or Enemies() > 3 } and Spell(whirlwind)
 				or not target.DebuffPresent(rend_debuff) and target.TimeToDie() > 8 and Spell(rend)
 			{
-				#bladestorm,if=cooldown.colossus_smash.remains>6&(!talent.ravager.enabled|cooldown.ravager.remains>6)
-				if SpellCooldown(colossus_smash) > 6 and { not Talent(ravager_talent) or SpellCooldown(ravager) > 6 } Spell(bladestorm)
 				#siegebreaker
 				Spell(siegebreaker)
 				#storm_bolt,if=cooldown.colossus_smash.remains>4|debuff.colossus_smash.up
@@ -292,6 +290,10 @@ AddIcon specialization=arms help=cd checkbox=opt_warrior_arms_aoe
 AddFunction FurySingleMindedFuryDefaultActions
 {
 	#auto_attack
+	#call_action_list,name=movement,if=movement.distance>5
+	if 0 > 5 FurySingleMindedFuryMovementActions()
+	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>2&active_enemies=1)|raid_event.movement.cooldown<5
+	if 600 < 60 and 0 > 2 and Enemies() == 1 or 600 < 5 FurySingleMindedFurySingleTargetActions()
 	#call_action_list,name=single_target,if=active_enemies=1
 	if Enemies() == 1 FurySingleMindedFurySingleTargetActions()
 	#call_action_list,name=two_targets,if=active_enemies=2
@@ -308,10 +310,14 @@ AddFunction FurySingleMindedFuryDefaultShortCdActions
 	if target.InRange(charge) Spell(charge)
 	# CHANGE: Get within melee range of the target.
 	GetInMeleeRange()
+	#call_action_list,name=movement,if=movement.distance>5
+	if 0 > 5 FurySingleMindedFuryMovementShortCdActions()
 	#berserker_rage,if=buff.enrage.down|(talent.unquenchable_thirst.enabled&buff.raging_blow.down)
 	if BuffExpires(enrage_buff any=1) or Talent(unquenchable_thirst_talent) and BuffExpires(raging_blow_buff) Spell(berserker_rage)
 	#heroic_leap,if=(raid_event.movement.distance>25&raid_event.movement.in>45)|!raid_event.movement.exists
 	if { 0 > 25 and 600 > 45 or not False(raid_event_movement_exists) } and target.InRange(charge) Spell(heroic_leap)
+	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>2&active_enemies=1)|raid_event.movement.cooldown<5
+	if 600 < 60 and 0 > 2 and Enemies() == 1 or 600 < 5 FurySingleMindedFurySingleTargetShortCdActions()
 	#call_action_list,name=single_target,if=active_enemies=1
 	if Enemies() == 1 FurySingleMindedFurySingleTargetShortCdActions()
 	#call_action_list,name=two_targets,if=active_enemies=2
@@ -326,10 +332,12 @@ AddFunction FurySingleMindedFuryDefaultCdActions
 {
 	# CHANGE: Add interrupt actions missing from SimulationCraft action list.
 	InterruptActions()
+	#call_action_list,name=movement,if=movement.distance>5
+	if 0 > 5 FurySingleMindedFuryMovementCdActions()
 	#potion,name=draenic_strength,if=(target.health.pct<20&buff.recklessness.up)|target.time_to_die<=25
 	if target.HealthPercent() < 20 and BuffPresent(recklessness_buff) or target.TimeToDie() <= 25 UsePotionStrength()
-	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>3&active_enemies=1)|raid_event.movement.cooldown<5
-	if 600 < 60 and 0 > 3 and Enemies() == 1 or 600 < 5 FurySingleMindedFurySingleTargetCdActions()
+	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>2&active_enemies=1)|raid_event.movement.cooldown<5
+	if 600 < 60 and 0 > 2 and Enemies() == 1 or 600 < 5 FurySingleMindedFurySingleTargetCdActions()
 	#recklessness,if=((target.time_to_die>190|target.health.pct<20)&(buff.bloodbath.up|!talent.bloodbath.enabled))|target.time_to_die<=12|talent.anger_management.enabled
 	if { target.TimeToDie() > 190 or target.HealthPercent() < 20 } and { BuffPresent(bloodbath_buff) or not Talent(bloodbath_talent) } or target.TimeToDie() <= 12 or Talent(anger_management_talent) Spell(recklessness)
 	#avatar,if=(buff.recklessness.up|target.time_to_die<=30)
@@ -411,6 +419,27 @@ AddFunction FurySingleMindedFuryAoeCdActions

 AddFunction FurySingleMindedFuryAoeCdActions {}

+# ActionList: FurySingleMindedFuryMovementActions --> main, shortcd, cd
+
+AddFunction FurySingleMindedFuryMovementActions
+{
+	unless Spell(storm_bolt)
+	{
+		#heroic_throw
+		Spell(heroic_throw)
+	}
+}
+
+AddFunction FurySingleMindedFuryMovementActions
+{
+	#heroic_leap
+	if target.InRange(charge) Spell(heroic_leap)
+	#storm_bolt
+	Spell(storm_bolt)
+}
+
+AddFunction FurySingleMindedFuryMovementCdActions {}
+
 # ActionList: FurySingleMindedFuryPrecombatActions --> main, shortcd, cd

 AddFunction FurySingleMindedFuryPrecombatActions
@@ -594,8 +623,10 @@ AddFunction FurySingleMindedFuryTwoTargetsCdActions
 AddFunction FuryTitansGripDefaultActions
 {
 	#auto_attack
-	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>3&active_enemies=1)|raid_event.movement.cooldown<5
-	if 600 < 60 and 0 > 3 and Enemies() == 1 or 600 < 5 FuryTitansGripSingleTargetActions()
+	#call_action_list,name=movement,if=movement.distance>5
+	if 0 > 5 FuryTitansGripMovementActions()
+	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>2&active_enemies=1)|raid_event.movement.cooldown<5
+	if 600 < 60 and 0 > 2 and Enemies() == 1 or 600 < 5 FuryTitansGripSingleTargetActions()
 	#call_action_list,name=single_target,if=active_enemies=1
 	if Enemies() == 1 FuryTitansGripSingleTargetActions()
 	#call_action_list,name=two_targets,if=active_enemies=2
@@ -612,12 +643,14 @@ AddFunction FuryTitansGripDefaultShortCdActions
 	if target.InRange(charge) Spell(charge)
 	# CHANGE: Get within melee range of the target.
 	GetInMeleeRange()
+	#call_action_list,name=movement,if=movement.distance>5
+	if 0 > 5 FuryTitansGripMovementShortCdActions()
 	#berserker_rage,if=buff.enrage.down|(talent.unquenchable_thirst.enabled&buff.raging_blow.down)
 	if BuffExpires(enrage_buff any=1) or Talent(unquenchable_thirst_talent) and BuffExpires(raging_blow_buff) Spell(berserker_rage)
 	#heroic_leap,if=(raid_event.movement.distance>25&raid_event.movement.in>45)|!raid_event.movement.exists
 	if { 0 > 25 and 600 > 45 or not False(raid_event_movement_exists) } and target.InRange(charge) Spell(heroic_leap)
-	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>3&active_enemies=1)|raid_event.movement.cooldown<5
-	if 600 < 60 and 0 > 3 and Enemies() == 1 or 600 < 5 FuryTitansGripSingleTargetShortCdActions()
+	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>2&active_enemies=1)|raid_event.movement.cooldown<5
+	if 600 < 60 and 0 > 2 and Enemies() == 1 or 600 < 5 FuryTitansGripSingleTargetShortCdActions()
 	#call_action_list,name=single_target,if=active_enemies=1
 	if Enemies() == 1 FuryTitansGripSingleTargetShortCdActions()
 	#call_action_list,name=two_targets,if=active_enemies=2
@@ -632,10 +665,12 @@ AddFunction FuryTitansGripDefaultCdActions
 {
 	# CHANGE: Add interrupt actions missing from SimulationCraft action list.
 	InterruptActions()
+	#call_action_list,name=movement,if=movement.distance>5
+	if 0 > 5 FuryTitansGripMovementCdActions()
 	#potion,name=draenic_strength,if=(target.health.pct<20&buff.recklessness.up)|target.time_to_die<=25
 	if target.HealthPercent() < 20 and BuffPresent(recklessness_buff) or target.TimeToDie() <= 25 UsePotionStrength()
-	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>3&active_enemies=1)|raid_event.movement.cooldown<5
-	if 600 < 60 and 0 > 3 and Enemies() == 1 or 600 < 5 FuryTitansGripSingleTargetCdActions()
+	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>2&active_enemies=1)|raid_event.movement.cooldown<5
+	if 600 < 60 and 0 > 2 and Enemies() == 1 or 600 < 5 FuryTitansGripSingleTargetCdActions()
 	#recklessness,if=((target.time_to_die>190|target.health.pct<20)&(buff.bloodbath.up|!talent.bloodbath.enabled))|target.time_to_die<=12|talent.anger_management.enabled
 	if { target.TimeToDie() > 190 or target.HealthPercent() < 20 } and { BuffPresent(bloodbath_buff) or not Talent(bloodbath_talent) } or target.TimeToDie() <= 12 or Talent(anger_management_talent) Spell(recklessness)
 	#avatar,if=(buff.recklessness.up|target.time_to_die<=30)
@@ -715,6 +750,27 @@ AddFunction FuryTitansGripAoeCdActions
 	}
 }

+# ActionList: FuryTitansGripMovementActions --> main, shortcd, cd
+
+AddFunction FuryTitansGripMovementActions
+{
+	unless Spell(storm_bolt)
+	{
+		#heroic_throw
+		Spell(heroic_throw)
+	}
+}
+
+AddFunction FuryTitansGripMovementActions
+{
+	#heroic_leap
+	if target.InRange(charge) Spell(heroic_leap)
+	#storm_bolt
+	Spell(storm_bolt)
+}
+
+AddFunction FuryTitansGripMovementCdActions {}
+
 # ActionList: FuryTitansGripPrecombatActions --> main, shortcd, cd

 AddFunction FuryTitansGripPrecombatActions
diff --git a/scripts/simulationcraft_druid_balance.lua b/scripts/simulationcraft_druid_balance.lua
index de22f64..368fedb 100644
--- a/scripts/simulationcraft_druid_balance.lua
+++ b/scripts/simulationcraft_druid_balance.lua
@@ -44,16 +44,20 @@ AddFunction BalanceAoeActions
 	if TimeToEclipse(lunar) < 8 or target.TimeToDie() < 20 Spell(celestial_alignment)
 	#incarnation,if=buff.celestial_alignment.up
 	if BuffPresent(celestial_alignment_buff) Spell(incarnation_caster)
-	#sunfire,if=remains<8
+	#sunfire,cycle_targets=1,if=remains<8
 	if target.DebuffRemaining(sunfire_debuff) < 8 Spell(sunfire)
-	#starfall,if=!buff.starfall.up
-	if not BuffPresent(starfall_buff) Spell(starfall)
+	#starfall,if=!buff.starfall.up&active_enemies>2
+	if not BuffPresent(starfall_buff) and Enemies() > 2 Spell(starfall)
+	#starsurge,if=(charges=2&recharge_time<6)|charges=3
+	if Charges(starsurge) == 2 and SpellChargeCooldown(starsurge) < 6 or Charges(starsurge) == 3 Spell(starsurge)
 	#moonfire,cycle_targets=1,if=remains<12
 	if target.DebuffRemaining(moonfire_debuff) < 12 Spell(moonfire)
 	#stellar_flare,cycle_targets=1,if=remains<7
 	if target.DebuffRemaining(stellar_flare_debuff) < 7 Spell(stellar_flare)
-	#starsurge,if=(charges=2&recharge_time<6)|charges=3
-	if Charges(starsurge) == 2 and SpellChargeCooldown(starsurge) < 6 or Charges(starsurge) == 3 Spell(starsurge)
+	#starsurge,if=buff.lunar_empowerment.down&eclipse_energy>20&active_enemies=2
+	if BuffExpires(lunar_empowerment_buff) and EclipseEnergy() > 20 and Enemies() == 2 Spell(starsurge)
+	#starsurge,if=buff.solar_empowerment.down&eclipse_energy<-40&active_enemies=2
+	if BuffExpires(solar_empowerment_buff) and EclipseEnergy() < -40 and Enemies() == 2 Spell(starsurge)
 	#wrath,if=(eclipse_energy<=0&eclipse_change>cast_time)|(eclipse_energy>0&cast_time>eclipse_change)
 	if EclipseEnergy() <= 0 and TimeToEclipse() > CastTime(wrath) or EclipseEnergy() > 0 and CastTime(wrath) > TimeToEclipse() Spell(wrath)
 	#starfire,if=(eclipse_energy>=0&eclipse_change>cast_time)|(eclipse_energy<0&cast_time>eclipse_change)
diff --git a/scripts/simulationcraft_shaman_enhancement.lua b/scripts/simulationcraft_shaman_enhancement.lua
index e4cfd18..3f6f2c1 100644
--- a/scripts/simulationcraft_shaman_enhancement.lua
+++ b/scripts/simulationcraft_shaman_enhancement.lua
@@ -8,7 +8,7 @@ do
 # Based on SimulationCraft profile "Shaman_Enhancement_T17M".
 #	class=shaman
 #	spec=enhancement
-#	talents=0002012
+#	talents=0001023
 #	glyphs=chain_lightning/frost_shock

 Include(ovale_common)
@@ -156,10 +156,10 @@ AddFunction EnhancementSingleActions
 	if Talent(unleashed_fury_talent) or ArmorSetBonus(T16_melee 2) == 1 Spell(unleash_elements)
 	#elemental_blast,if=buff.maelstrom_weapon.react>=4|buff.ancestral_swiftness.up
 	if BuffStacks(maelstrom_weapon_buff) >= 4 or BuffPresent(ancestral_swiftness_buff) Spell(elemental_blast)
-	#lightning_bolt,if=buff.maelstrom_weapon.react=5|(buff.maelstrom_weapon.react>=4&!buff.ascendance.up)|(buff.ancestral_swiftness.up&buff.maelstrom_weapon.react>=3)
-	if BuffStacks(maelstrom_weapon_buff) == 5 or BuffStacks(maelstrom_weapon_buff) >= 4 and not BuffPresent(ascendance_melee_buff) or BuffPresent(ancestral_swiftness_buff) and BuffStacks(maelstrom_weapon_buff) >= 3 Spell(lightning_bolt)
 	#windstrike
 	if BuffPresent(ascendance_melee_buff) Spell(windstrike)
+	#lightning_bolt,if=buff.maelstrom_weapon.react=5
+	if BuffStacks(maelstrom_weapon_buff) == 5 Spell(lightning_bolt)
 	#stormstrike
 	Spell(stormstrike)
 	#lava_lash
@@ -172,8 +172,8 @@ AddFunction EnhancementSingleActions
 	if Talent(elemental_fusion_talent) and target.DebuffRemaining(flame_shock_debuff) >= 16 or not Talent(elemental_fusion_talent) Spell(frost_shock)
 	#elemental_blast,if=buff.maelstrom_weapon.react>=1
 	if BuffStacks(maelstrom_weapon_buff) >= 1 Spell(elemental_blast)
-	#lightning_bolt,if=buff.maelstrom_weapon.react>=1&!buff.ascendance.up
-	if BuffStacks(maelstrom_weapon_buff) >= 1 and not BuffPresent(ascendance_melee_buff) Spell(lightning_bolt)
+	#lightning_bolt,if=(buff.maelstrom_weapon.react>=1&!buff.ascendance.up)|buff.ancestral_swiftness.up
+	if BuffStacks(maelstrom_weapon_buff) >= 1 and not BuffPresent(ascendance_melee_buff) or BuffPresent(ancestral_swiftness_buff) Spell(lightning_bolt)
 	#searing_totem,if=pet.searing_totem.remains<=20&!pet.fire_elemental_totem.active&!buff.liquid_magma.up
 	if TotemRemaining(fire totem=searing_totem) <= 20 and not TotemPresent(fire totem=fire_elemental_totem) and not BuffPresent(liquid_magma_buff) Spell(searing_totem)
 }
diff --git a/scripts/simulationcraft_warrior_arms.lua b/scripts/simulationcraft_warrior_arms.lua
index aedced5..d144704 100644
--- a/scripts/simulationcraft_warrior_arms.lua
+++ b/scripts/simulationcraft_warrior_arms.lua
@@ -78,8 +78,8 @@ AddFunction ArmsAoeActions
 	if target.TicksRemaining(rend_debuff) < 2 and target.TimeToDie() > 4 Spell(rend)
 	#ravager,if=buff.bloodbath.up|!talent.bloodbath.enabled
 	if BuffPresent(bloodbath_buff) or not Talent(bloodbath_talent) Spell(ravager)
-	#bladestorm,if=active_enemies>5
-	if Enemies() > 5 Spell(bladestorm)
+	#bladestorm
+	Spell(bladestorm)
 	#colossus_smash,if=dot.rend.ticking
 	if target.DebuffPresent(rend_debuff) Spell(colossus_smash)
 	#mortal_strike,if=cooldown.colossus_smash.remains>1.5&target.health.pct>20&active_enemies=2
@@ -92,8 +92,6 @@ AddFunction ArmsAoeActions
 	if SpellCooldown(colossus_smash) > 1.5 and { target.HealthPercent() > 20 or Enemies() > 3 } Spell(whirlwind)
 	#rend,cycle_targets=1,if=!ticking&target.time_to_die>8
 	if not target.DebuffPresent(rend_debuff) and target.TimeToDie() > 8 Spell(rend)
-	#bladestorm,if=cooldown.colossus_smash.remains>6&(!talent.ravager.enabled|cooldown.ravager.remains>6)
-	if SpellCooldown(colossus_smash) > 6 and { not Talent(ravager_talent) or SpellCooldown(ravager) > 6 } Spell(bladestorm)
 	#siegebreaker
 	Spell(siegebreaker)
 	#storm_bolt,if=cooldown.colossus_smash.remains>4|debuff.colossus_smash.up
@@ -191,7 +189,6 @@ AddIcon specialization=arms help=aoe
 # pummel
 # quaking_palm
 # ravager
-# ravager_talent
 # recklessness
 # recklessness_buff
 # rend
diff --git a/scripts/simulationcraft_warrior_fury_1h.lua b/scripts/simulationcraft_warrior_fury_1h.lua
index 084fa93..9f10e19 100644
--- a/scripts/simulationcraft_warrior_fury_1h.lua
+++ b/scripts/simulationcraft_warrior_fury_1h.lua
@@ -54,8 +54,8 @@ AddFunction FurySingleMindedFuryDefaultActions
 	if { 0 > 25 and 600 > 45 or not False(raid_event_movement_exists) } and target.InRange(charge) Spell(heroic_leap)
 	#potion,name=draenic_strength,if=(target.health.pct<20&buff.recklessness.up)|target.time_to_die<=25
 	if target.HealthPercent() < 20 and BuffPresent(recklessness_buff) or target.TimeToDie() <= 25 UsePotionStrength()
-	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>3&active_enemies=1)|raid_event.movement.cooldown<5
-	if 600 < 60 and 0 > 3 and Enemies() == 1 or 600 < 5 FurySingleMindedFurySingleTargetActions()
+	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>2&active_enemies=1)|raid_event.movement.cooldown<5
+	if 600 < 60 and 0 > 2 and Enemies() == 1 or 600 < 5 FurySingleMindedFurySingleTargetActions()
 	#recklessness,if=((target.time_to_die>190|target.health.pct<20)&(buff.bloodbath.up|!talent.bloodbath.enabled))|target.time_to_die<=12|talent.anger_management.enabled
 	if { target.TimeToDie() > 190 or target.HealthPercent() < 20 } and { BuffPresent(bloodbath_buff) or not Talent(bloodbath_talent) } or target.TimeToDie() <= 12 or Talent(anger_management_talent) Spell(recklessness)
 	#avatar,if=(buff.recklessness.up|target.time_to_die<=30)
diff --git a/scripts/simulationcraft_warrior_fury_2h.lua b/scripts/simulationcraft_warrior_fury_2h.lua
index 94a87a9..19fdd8b 100644
--- a/scripts/simulationcraft_warrior_fury_2h.lua
+++ b/scripts/simulationcraft_warrior_fury_2h.lua
@@ -54,8 +54,8 @@ AddFunction FuryTitansGripDefaultActions
 	if { 0 > 25 and 600 > 45 or not False(raid_event_movement_exists) } and target.InRange(charge) Spell(heroic_leap)
 	#potion,name=draenic_strength,if=(target.health.pct<20&buff.recklessness.up)|target.time_to_die<=25
 	if target.HealthPercent() < 20 and BuffPresent(recklessness_buff) or target.TimeToDie() <= 25 UsePotionStrength()
-	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>3&active_enemies=1)|raid_event.movement.cooldown<5
-	if 600 < 60 and 0 > 3 and Enemies() == 1 or 600 < 5 FuryTitansGripSingleTargetActions()
+	#call_action_list,name=single_target,if=(raid_event.adds.cooldown<60&raid_event.adds.count>2&active_enemies=1)|raid_event.movement.cooldown<5
+	if 600 < 60 and 0 > 2 and Enemies() == 1 or 600 < 5 FuryTitansGripSingleTargetActions()
 	#recklessness,if=((target.time_to_die>190|target.health.pct<20)&(buff.bloodbath.up|!talent.bloodbath.enabled))|target.time_to_die<=12|talent.anger_management.enabled
 	if { target.TimeToDie() > 190 or target.HealthPercent() < 20 } and { BuffPresent(bloodbath_buff) or not Talent(bloodbath_talent) } or target.TimeToDie() <= 12 or Talent(anger_management_talent) Spell(recklessness)
 	#avatar,if=(buff.recklessness.up|target.time_to_die<=30)