diff --git a/proto/api.proto b/proto/api.proto
index 6302145a16..95a7cf8923 100644
--- a/proto/api.proto
+++ b/proto/api.proto
@@ -126,6 +126,7 @@ message SimOptions {
 	bool save_all_values = 7; // Only used internally.
 	bool interactive = 8; // Enables interactive mode.
 	bool use_labeled_rands = 9; // Use test level RNG.
+	bool use_aq_spell_ranks = 10;
 }
 
 // The aggregated results from all uses of a particular action.
diff --git a/proto/ui.proto b/proto/ui.proto
index f029b6bfd0..4f65740300 100644
--- a/proto/ui.proto
+++ b/proto/ui.proto
@@ -300,6 +300,7 @@ message SimSettings {
 	string language = 9;
 	Faction faction = 6;
 	DatabaseFilters filters = 10;
+	bool use_aq_spell_ranks = 12;
 }
 
 // Contains all information that is imported/exported from an individual sim.
diff --git a/sim/core/buffs.go b/sim/core/buffs.go
index c70d57e862..b507eee713 100644
--- a/sim/core/buffs.go
+++ b/sim/core/buffs.go
@@ -50,30 +50,6 @@ const (
 	ScrollOfProtection
 )
 
-var LevelToBuffRank = map[BuffName]map[int32]int32{
-	BattleShout: {
-		25: 3,
-		40: 4,
-		50: 5,
-		60: TernaryInt32(IncludeAQ, 7, 6),
-	},
-	GraceOfAir: {
-		50: 1,
-		60: TernaryInt32(IncludeAQ, 3, 2),
-	},
-	StrengthOfEarth: {
-		25: 2,
-		40: 3,
-		50: 3,
-		60: TernaryInt32(IncludeAQ, 5, 4),
-	},
-	Windfury: {
-		40: 1,
-		50: 2,
-		60: 3,
-	},
-}
-
 // Stats from buffs pre-tristate buffs
 var BuffSpellByLevel = map[BuffName]map[int32]stats.Stats{
 	ArcaneIntellect: {
@@ -118,66 +94,6 @@ var BuffSpellByLevel = map[BuffName]map[int32]stats.Stats{
 			stats.NatureResistance: 60,
 		},
 	},
-	BattleShout: {
-		25: stats.Stats{
-			stats.AttackPower: 57,
-		},
-		40: stats.Stats{
-			stats.AttackPower: 93,
-		},
-		50: stats.Stats{
-			stats.AttackPower: 138,
-		},
-		60: stats.Stats{
-			stats.AttackPower: TernaryFloat64(IncludeAQ, 232, 193),
-		},
-	},
-	BlessingOfMight: {
-		25: stats.Stats{
-			stats.AttackPower: 55,
-		},
-		40: stats.Stats{
-			stats.AttackPower: 85,
-		},
-		50: stats.Stats{
-			stats.AttackPower: 115,
-		},
-		60: stats.Stats{
-			stats.AttackPower: TernaryFloat64(IncludeAQ, 185, 155),
-		},
-	},
-	BlessingOfWisdom: {
-		25: stats.Stats{
-			stats.MP5: 15,
-		},
-		40: stats.Stats{
-			stats.MP5: 20,
-		},
-		50: stats.Stats{
-			stats.MP5: 25,
-		},
-		60: stats.Stats{
-			stats.MP5: TernaryFloat64(IncludeAQ, 33, 30),
-		},
-	},
-	HornOfLordaeron: {
-		25: stats.Stats{
-			stats.Strength: 17,
-			stats.Agility:  17,
-		},
-		40: stats.Stats{
-			stats.Strength: 26,
-			stats.Agility:  26,
-		},
-		50: stats.Stats{
-			stats.Strength: 45,
-			stats.Agility:  45,
-		},
-		60: stats.Stats{
-			stats.Strength: TernaryFloat64(IncludeAQ, 89, 70.15),
-			stats.Agility:  TernaryFloat64(IncludeAQ, 89, 70.15),
-		},
-	},
 	BloodPact: {
 		25: stats.Stats{
 			stats.Stamina: 9,
@@ -220,20 +136,6 @@ var BuffSpellByLevel = map[BuffName]map[int32]stats.Stats{
 			stats.BonusArmor: 735,
 		},
 	},
-	GraceOfAir: {
-		25: stats.Stats{
-			stats.Agility: 0,
-		},
-		40: stats.Stats{
-			stats.Agility: 0,
-		},
-		50: stats.Stats{
-			stats.Agility: 43,
-		},
-		60: stats.Stats{
-			stats.Agility: TernaryFloat64(IncludeAQ, 77, 67),
-		},
-	},
 	FireResistanceAura: {
 		25: stats.Stats{
 			stats.FireResistance: 0,
@@ -414,20 +316,6 @@ var BuffSpellByLevel = map[BuffName]map[int32]stats.Stats{
 			stats.ShadowResistance: 60,
 		},
 	},
-	StrengthOfEarth: {
-		25: stats.Stats{
-			stats.Strength: 20,
-		},
-		40: stats.Stats{
-			stats.Strength: 36,
-		},
-		50: stats.Stats{
-			stats.Strength: 36,
-		},
-		60: stats.Stats{
-			stats.Strength: TernaryFloat64(IncludeAQ, 77, 61),
-		},
-	},
 	ScrollOfAgility: {
 		25: stats.Stats{
 			stats.Agility: 9,
@@ -773,11 +661,7 @@ func applyBuffEffects(agent Agent, playerFaction proto.Faction, raidBuffs *proto
 	}
 
 	if individualBuffs.BlessingOfWisdom > 0 && isAlliance {
-		updateStats := BuffSpellByLevel[BlessingOfWisdom][level]
-		if individualBuffs.BlessingOfWisdom == proto.TristateEffect_TristateEffectImproved {
-			updateStats = updateStats.Multiply(1.2)
-		}
-		character.AddStats(updateStats)
+		MakePermanent(BlessingOfWisdomAura(&character.Unit, GetTristateValueInt32(individualBuffs.BlessingOfWisdom, 0, 2), character.Level))
 	} else if raidBuffs.ManaSpringTotem > 0 && isHorde {
 		updateStats := BuffSpellByLevel[ManaSpring][level]
 		if raidBuffs.ManaSpringTotem == proto.TristateEffect_TristateEffectImproved {
@@ -1919,11 +1803,22 @@ func spellPowerBonusEffect(aura *Aura, spellPowerBonus float64) *ExclusiveEffect
 	})
 }
 
+const StrengthOfEarthTotemRanks = 5
+
+var StrengthOfEarthTotemSpellId = [StrengthOfEarthTotemRanks + 1]int32{0, 8075, 8160, 8161, 10442, 25361}
+var StrengthOfEarthStrength = [StrengthOfEarthTotemRanks + 1]float64{0, 10, 20, 36, 61, 77}
+
 func StrengthOfEarthTotemAura(unit *Unit, level int32, multiplier float64) *Aura {
-	rank := LevelToBuffRank[StrengthOfEarth][level]
-	spellID := []int32{0, 8075, 8160, 8161, 10442, 25361}[rank]
+	rank := map[int32]int32{
+		25: 2,
+		40: 3,
+		50: 3,
+		60: TernaryInt32(unit.Env.UseAQSpellRanks, 5, 4),
+	}[level]
+	spellID := StrengthOfEarthTotemSpellId[rank]
+	bonusStrength := math.Floor(StrengthOfEarthStrength[rank] * multiplier)
+
 	duration := time.Minute * 2
-	updateStats := BuffSpellByLevel[StrengthOfEarth][level].Multiply(multiplier).Floor()
 
 	aura := unit.GetOrRegisterAura(Aura{
 		Label:      "Strength of Earth Totem",
@@ -1932,27 +1827,35 @@ func StrengthOfEarthTotemAura(unit *Unit, level int32, multiplier float64) *Aura
 		BuildPhase: CharacterBuildPhaseBuffs,
 		OnGain: func(aura *Aura, sim *Simulation) {
 			if aura.Unit.Env.MeasuringStats && aura.Unit.Env.State != Finalized {
-				unit.AddStats(updateStats)
+				unit.AddStat(stats.Strength, bonusStrength)
 			} else {
-				unit.AddStatsDynamic(sim, updateStats)
+				unit.AddStatDynamic(sim, stats.Strength, bonusStrength)
 			}
 		},
 		OnExpire: func(aura *Aura, sim *Simulation) {
 			if aura.Unit.Env.MeasuringStats && aura.Unit.Env.State != Finalized {
-				unit.AddStats(updateStats.Multiply(-1))
+				unit.AddStat(stats.Strength, -bonusStrength)
 			} else {
-				unit.AddStatsDynamic(sim, updateStats.Multiply(-1))
+				unit.AddStatDynamic(sim, stats.Strength, -bonusStrength)
 			}
 		},
 	})
 	return aura
 }
 
+const GraceOfAirTotemRanks = 3
+
+var GraceOfAirTotemSpellId = [GraceOfAirTotemRanks + 1]int32{0, 8835, 10627, 25359}
+var GraceOfAirTotemAgility = [GraceOfAirTotemRanks + 1]float64{0, 43, 67, 77}
+
 func GraceOfAirTotemAura(unit *Unit, level int32, multiplier float64) *Aura {
-	rank := LevelToBuffRank[GraceOfAir][level]
+	rank := map[int32]int32{
+		50: 1,
+		60: TernaryInt32(unit.Env.UseAQSpellRanks, 3, 2),
+	}[level]
 	spellID := []int32{0, 8835, 10627, 25359}[rank]
 	duration := time.Minute * 2
-	updateStats := BuffSpellByLevel[GraceOfAir][level].Multiply(multiplier).Floor()
+	bonusAgi := math.Floor(GraceOfAirTotemAgility[rank] * multiplier)
 
 	aura := unit.GetOrRegisterAura(Aura{
 		Label:      "Grace of Air Totem",
@@ -1961,16 +1864,16 @@ func GraceOfAirTotemAura(unit *Unit, level int32, multiplier float64) *Aura {
 		BuildPhase: CharacterBuildPhaseBuffs,
 		OnGain: func(aura *Aura, sim *Simulation) {
 			if aura.Unit.Env.MeasuringStats && aura.Unit.Env.State != Finalized {
-				unit.AddStats(updateStats)
+				unit.AddStat(stats.Agility, bonusAgi)
 			} else {
-				unit.AddStatsDynamic(sim, updateStats)
+				unit.AddStatDynamic(sim, stats.Agility, bonusAgi)
 			}
 		},
 		OnExpire: func(aura *Aura, sim *Simulation) {
 			if aura.Unit.Env.MeasuringStats && aura.Unit.Env.State != Finalized {
-				unit.AddStats(updateStats.Multiply(-1))
+				unit.AddStat(stats.Agility, -bonusAgi)
 			} else {
-				unit.AddStatsDynamic(sim, updateStats.Multiply(-1))
+				unit.AddStatDynamic(sim, stats.Agility, -bonusAgi)
 			}
 		},
 	})
@@ -1984,9 +1887,14 @@ var BattleShoutBaseAP = [BattleShoutRanks + 1]float64{0, 20, 40, 57, 93, 138, 19
 var BattleShoutLevel = [BattleShoutRanks + 1]int{0, 1, 12, 22, 32, 42, 52, 60}
 
 func BattleShoutAura(unit *Unit, impBattleShout int32, boomingVoicePts int32) *Aura {
-	rank := LevelToBuffRank[BattleShout][unit.Level]
+	rank := map[int32]int32{
+		25: 3,
+		40: 4,
+		50: 5,
+		60: TernaryInt32(unit.Env.UseAQSpellRanks, 7, 6),
+	}[unit.Level]
 	spellId := BattleShoutSpellId[rank]
-	baseAP := BattleShoutBaseAP[rank]
+	baseAP := math.Floor(BattleShoutBaseAP[rank] * (1 + 0.05*float64(impBattleShout)))
 
 	return unit.GetOrRegisterAura(Aura{
 		Label:      "Battle Shout",
@@ -1994,14 +1902,18 @@ func BattleShoutAura(unit *Unit, impBattleShout int32, boomingVoicePts int32) *A
 		Duration:   time.Duration(float64(time.Minute*2) * (1 + 0.1*float64(boomingVoicePts))),
 		BuildPhase: CharacterBuildPhaseBuffs,
 		OnGain: func(aura *Aura, sim *Simulation) {
-			aura.Unit.AddStatsDynamic(sim, stats.Stats{
-				stats.AttackPower: math.Floor(baseAP * (1 + 0.05*float64(impBattleShout))),
-			})
+			if aura.Unit.Env.MeasuringStats && aura.Unit.Env.State != Finalized {
+				aura.Unit.AddStat(stats.AttackPower, baseAP)
+			} else {
+				aura.Unit.AddStatDynamic(sim, stats.AttackPower, baseAP)
+			}
 		},
 		OnExpire: func(aura *Aura, sim *Simulation) {
-			aura.Unit.AddStatsDynamic(sim, stats.Stats{
-				stats.AttackPower: -1 * math.Floor(baseAP*(1+0.05*float64(impBattleShout))),
-			})
+			if aura.Unit.Env.MeasuringStats && aura.Unit.Env.State != Finalized {
+				aura.Unit.AddStat(stats.AttackPower, -baseAP)
+			} else {
+				aura.Unit.AddStatDynamic(sim, stats.AttackPower, -baseAP)
+			}
 		},
 	})
 }
@@ -2051,15 +1963,20 @@ func TrueshotAura(unit *Unit) *Aura {
 	return aura
 }
 
+const BlessingOfMightRanks = 7
+
+var BlessingOfMightSpellID = [BlessingOfMightRanks + 1]int32{0, 19740, 19834, 19835, 19836, 19837, 19838, 25291}
+var BlessingOfMightBaseAP = [BlessingOfMightRanks + 1]float64{0, 20, 35, 55, 85, 115, 155, 185}
+
 func BlessingOfMightAura(unit *Unit, impBomPts int32, level int32) *Aura {
-	spellID := map[int32]int32{
-		25: 19835,
-		40: 19836,
-		50: 19837,
-		60: TernaryInt32(IncludeAQ, 25291, 19838),
+	rank := map[int32]int32{
+		25: 3,
+		40: 4,
+		50: 5,
+		60: TernaryInt32(unit.Env.UseAQSpellRanks, 7, 6),
 	}[level]
-
-	bonusAP := math.Floor(BuffSpellByLevel[BlessingOfMight][level][stats.AttackPower] * (1 + 0.04*float64(impBomPts)))
+	spellID := BlessingOfMightSpellID[rank]
+	bonusAP := math.Floor(BlessingOfMightBaseAP[rank] * (1 + 0.04*float64(impBomPts)))
 
 	aura := MakePermanent(unit.GetOrRegisterAura(Aura{
 		Label:      "Blessing of Might",
@@ -2079,7 +1996,12 @@ func BlessingOfMightAura(unit *Unit, impBomPts int32, level int32) *Aura {
 }
 
 func HornOfLordaeronAura(unit *Unit, level int32) *Aura {
-	updateStats := BuffSpellByLevel[HornOfLordaeron][level]
+	bonusAmount := map[int32]float64{
+		25: 17,
+		40: 26,
+		50: 45,
+		60: TernaryFloat64(unit.Env.UseAQSpellRanks, 89, 70.15),
+	}[level]
 
 	aura := MakePermanent(unit.RegisterAura(Aura{
 		Label:    "Horn Of Lordaeron",
@@ -2089,14 +2011,53 @@ func HornOfLordaeronAura(unit *Unit, level int32) *Aura {
 	makeExclusiveBuff(aura, BuffConfig{
 		Category: "Paladin Physical Buffs",
 		Stats: []StatConfig{
-			{stats.Agility, updateStats[stats.Agility], false},
-			{stats.Strength, updateStats[stats.Strength], false},
+			{stats.Agility, bonusAmount, false},
+			{stats.Strength, bonusAmount, false},
 		},
 	})
 
 	return aura
 }
 
+const BlessingOfWisdomRanks = 6
+
+var BlessingOfWisdomSpellID = [BlessingOfWisdomRanks + 1]int32{0, 19742, 19850, 19852, 19853, 19854, 25290}
+var BlessingOfWisdomMP5 = [BlessingOfWisdomRanks + 1]float64{0, 10, 15, 20, 25, 30, 33}
+
+func BlessingOfWisdomAura(unit *Unit, impBowPts int32, level int32) *Aura {
+	rank := map[int32]int32{
+		25: 2,
+		40: 3,
+		50: 4,
+		60: TernaryInt32(unit.Env.UseAQSpellRanks, 6, 5),
+	}[level]
+	spellID := BlessingOfWisdomSpellID[rank]
+	bonusMP5 := math.Floor(BlessingOfWisdomMP5[rank] * (1 + 0.10*float64(impBowPts)))
+
+	aura := MakePermanent(unit.GetOrRegisterAura(Aura{
+		Label:      "Blessing of Wisdom",
+		ActionID:   ActionID{SpellID: spellID},
+		Duration:   NeverExpires,
+		BuildPhase: CharacterBuildPhaseBuffs,
+		OnGain: func(aura *Aura, sim *Simulation) {
+			if aura.Unit.Env.MeasuringStats && aura.Unit.Env.State != Finalized {
+				aura.Unit.AddStat(stats.MP5, bonusMP5)
+			} else {
+				aura.Unit.AddStatDynamic(sim, stats.MP5, bonusMP5)
+			}
+		},
+		OnExpire: func(aura *Aura, sim *Simulation) {
+			if aura.Unit.Env.MeasuringStats && aura.Unit.Env.State != Finalized {
+				aura.Unit.AddStat(stats.MP5, -bonusMP5)
+			} else {
+				aura.Unit.AddStatDynamic(sim, stats.MP5, -bonusMP5)
+			}
+		},
+	}))
+
+	return aura
+}
+
 // TODO: Are there exclusive AP buffs in SoD?
 // func attackPowerBonusEffect(aura *Aura, apBonus float64) *ExclusiveEffect {
 // 	return aura.NewExclusiveEffect("AttackPowerBonus", false, ExclusiveEffect{
@@ -2267,12 +2228,15 @@ func GetWindfuryAP(aura *Aura, rank int32) float64 {
 }
 
 func ApplyWindfury(character *Character) *Aura {
-	level := character.Level
-	if level < 32 {
+	if character.Level < 32 {
 		return nil
 	}
 
-	rank := LevelToBuffRank[Windfury][level]
+	rank := map[int32]int32{
+		40: 1,
+		50: 2,
+		60: 3,
+	}[character.Level]
 	spellId := WindfuryBuffSpellId[rank]
 	buffActionID := ActionID{SpellID: spellId}
 
diff --git a/sim/core/config.go b/sim/core/config.go
deleted file mode 100644
index 4af12bc475..0000000000
--- a/sim/core/config.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package core
-
-// Global configuration settings
-
-// Whether to include spell ranks only accessible after the release of Ahn'Qiraj
-const IncludeAQ = true
diff --git a/sim/core/environment.go b/sim/core/environment.go
index 9c9aa147a8..12a948b526 100644
--- a/sim/core/environment.go
+++ b/sim/core/environment.go
@@ -31,7 +31,8 @@ type Environment struct {
 
 	// Whether stats are currently being measured. Used to disable some validation
 	// checks which are otherwise helpful.
-	MeasuringStats bool
+	MeasuringStats  bool
+	UseAQSpellRanks bool
 
 	Raid      *Raid
 	Encounter Encounter
@@ -71,8 +72,8 @@ func (env *Environment) construct(raidProto *proto.Raid, encounterProto *proto.E
 	env.Encounter = NewEncounter(encounterProto)
 	env.BaseDuration = env.Encounter.Duration
 	env.DurationVariation = env.Encounter.DurationVariation
-	env.Raid = NewRaid(raidProto)
 
+	env.Raid = NewRaid(raidProto)
 	env.Raid.updatePlayersAndPets()
 
 	env.AllUnits = append(env.Encounter.TargetUnits, env.Raid.AllUnits...)
diff --git a/sim/core/sim.go b/sim/core/sim.go
index ef46408df6..5a4f6656f2 100644
--- a/sim/core/sim.go
+++ b/sim/core/sim.go
@@ -39,7 +39,7 @@ type Simulation struct {
 	NeedsInput     bool          // Sim is in interactive mode and needs input
 
 	ProgressReport func(*proto.ProgressMetrics)
-	Signals simsignals.Signals
+	Signals        simsignals.Signals
 
 	Log func(string, ...interface{})
 
@@ -58,7 +58,7 @@ type Simulation struct {
 
 	minWeaponAttackTime time.Duration
 	weaponAttacks       []*WeaponAttack
-	extraAttacks int32
+	extraAttacks        int32
 
 	minTaskTime time.Duration
 	tasks       []Task
@@ -185,6 +185,8 @@ func runSim(rsr *proto.RaidSimRequest, progress chan *proto.ProgressMetrics, ski
 
 func NewSim(rsr *proto.RaidSimRequest, signals simsignals.Signals) *Simulation {
 	env, _, _ := NewEnvironment(rsr.Raid, rsr.Encounter, false)
+	env.UseAQSpellRanks = rsr.SimOptions.UseAqSpellRanks
+
 	return newSimWithEnv(env, rsr.SimOptions, signals)
 }
 
@@ -347,7 +349,7 @@ func (sim *Simulation) run() *proto.RaidSimResult {
 		Logs:                   logsBuffer.String(),
 		FirstIterationDuration: firstIterationDuration.Seconds(),
 		AvgIterationDuration:   totalDuration.Seconds() / float64(sim.Options.Iterations),
-		IterationsDone: sim.Options.Iterations,
+		IterationsDone:         sim.Options.Iterations,
 	}
 
 	// Final progress report
diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
index 8dbc5f2f7c..b861c1c936 100644
--- a/sim/druid/balance/TestBalance.results
+++ b/sim/druid/balance/TestBalance.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestBalance-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 212.3
-  final_stats: 195.8
+  final_stats: 192.5
+  final_stats: 183.7
   final_stats: 476.905
   final_stats: 349.8
   final_stats: 205.7
@@ -165,21 +165,21 @@ character_stats_results: {
   final_stats: 32.64166
   final_stats: 0
   final_stats: 0
-  final_stats: 1274.6
+  final_stats: 1186
   final_stats: 9
-  final_stats: 27.69
+  final_stats: 27.085
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 6211
   final_stats: 0
   final_stats: 0
-  final_stats: 1958.6
+  final_stats: 1934.4
   final_stats: 780
   final_stats: 11
   final_stats: 5.44
   final_stats: 0
-  final_stats: 11.13
+  final_stats: 10.525
   final_stats: 5.44
   final_stats: 0
   final_stats: 6690.6525
@@ -197,8 +197,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestBalance-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 244.145
-  final_stats: 225.17
+  final_stats: 221.375
+  final_stats: 211.255
   final_stats: 570.262
   final_stats: 440.22
   final_stats: 283.36
@@ -214,21 +214,21 @@ character_stats_results: {
   final_stats: 40.15167
   final_stats: 0
   final_stats: 0
-  final_stats: 1298.29
+  final_stats: 1203.75
   final_stats: 9
-  final_stats: 34.1585
+  final_stats: 33.46275
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 7567.3
   final_stats: 0
   final_stats: 0
-  final_stats: 2104.34
+  final_stats: 2076.51
   final_stats: 740
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 12.1585
+  final_stats: 11.46275
   final_stats: 5
   final_stats: 0
   final_stats: 7670.901
@@ -396,9 +396,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.34008
+  weights: 1.18007
   weights: 0
-  weights: 2.44437
+  weights: 2.44752
   weights: 0
   weights: 0
   weights: 0
@@ -407,7 +407,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 31.94758
+  weights: 27.22225
   weights: 0
   weights: 0
   weights: 0
@@ -445,7 +445,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.32421
+  weights: 3.31619
   weights: 0
   weights: 3.03539
   weights: 0
@@ -456,7 +456,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 37.01805
+  weights: 36.94748
   weights: 0
   weights: 0
   weights: 0
@@ -806,308 +806,308 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-BloodGuard'sCracklingLeather"
  value: {
-  dps: 1251.63021
-  tps: 1269.49297
+  dps: 1248.73293
+  tps: 1266.61044
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-BloodGuard'sLeather"
  value: {
-  dps: 1173.61123
-  tps: 1191.77391
+  dps: 1159.68813
+  tps: 1177.83606
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-BloodGuard'sRestoredLeather"
  value: {
-  dps: 1135.72735
-  tps: 1153.28036
+  dps: 1135.65507
+  tps: 1153.22775
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
-  dps: 1590.80111
-  tps: 1609.68162
+  dps: 1581.83013
+  tps: 1600.70081
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-EmeraldDreamkeeperGarb"
  value: {
-  dps: 1139.65817
-  tps: 1157.31935
+  dps: 1133.97874
+  tps: 1151.576
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-EmeraldLeathers"
  value: {
-  dps: 1172.83013
-  tps: 1190.99281
+  dps: 1158.91985
+  tps: 1177.06778
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-EmeraldWatcherVestments"
  value: {
-  dps: 1208.83209
-  tps: 1226.49818
+  dps: 1210.1016
+  tps: 1227.73327
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 1599.15427
-  tps: 1617.84303
+  dps: 1590.8304
+  tps: 1609.50933
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-FeralheartRaiment"
  value: {
-  dps: 1151.90109
-  tps: 1171.06047
+  dps: 1140.72697
+  tps: 1159.81153
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather"
  value: {
-  dps: 1251.63021
-  tps: 1269.49297
+  dps: 1248.73293
+  tps: 1266.61044
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLeather"
  value: {
-  dps: 1173.61123
-  tps: 1191.77391
+  dps: 1159.68813
+  tps: 1177.83606
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather"
  value: {
-  dps: 1135.72735
-  tps: 1153.28036
+  dps: 1135.65507
+  tps: 1153.22775
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 1695.50069
-  tps: 1714.43036
+  dps: 1702.42194
+  tps: 1721.32703
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3418.62616
-  tps: 3438.7838
+  dps: 3409.23054
+  tps: 3429.28091
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5704.21467
-  tps: 6136.96187
+  dps: 5667.38286
+  tps: 6098.12353
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3379.52487
-  tps: 3399.05891
+  dps: 3375.59272
+  tps: 3395.0585
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3317.71731
-  tps: 3332.83606
+  dps: 3272.94035
+  tps: 3287.54574
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2790.28092
-  tps: 2971.02774
+  dps: 2774.05939
+  tps: 2954.80622
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1733.79842
-  tps: 1742.83576
+  dps: 1724.86013
+  tps: 1733.89747
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1944.6792
-  tps: 1959.86295
+  dps: 1906.60051
+  tps: 1921.78427
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5700.25885
-  tps: 6148.23599
+  dps: 5664.33164
+  tps: 6103.68332
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3377.00509
-  tps: 3396.53912
+  dps: 3372.68031
+  tps: 3392.14608
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3314.47687
-  tps: 3329.59562
+  dps: 3271.73703
+  tps: 3286.34243
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2796.3806
-  tps: 2977.12743
+  dps: 2743.94198
+  tps: 2921.11647
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1722.01203
-  tps: 1731.04937
+  dps: 1714.40739
+  tps: 1723.44473
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1938.19853
-  tps: 1953.38229
+  dps: 1904.61119
+  tps: 1919.79495
  }
 }
 dps_results: {
  key: "TestBalance-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3364.99186
-  tps: 3385.25847
+  dps: 3391.26215
+  tps: 3411.57417
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sCracklingLeather"
  value: {
-  dps: 1573.16923
-  tps: 1591.54824
+  dps: 1569.2598
+  tps: 1587.63881
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sLeather"
  value: {
-  dps: 1456.73768
-  tps: 1475.14618
+  dps: 1452.13235
+  tps: 1470.54086
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-BloodGuard'sRestoredLeather"
  value: {
-  dps: 1446.36482
-  tps: 1464.61108
+  dps: 1442.53566
+  tps: 1460.78191
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
-  dps: 2124.60747
-  tps: 2042.82593
+  dps: 2115.91777
+  tps: 2038.10404
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldDreamkeeperGarb"
  value: {
-  dps: 1448.92798
-  tps: 1467.1644
+  dps: 1444.93856
+  tps: 1463.17499
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldLeathers"
  value: {
-  dps: 1455.77952
-  tps: 1474.18803
+  dps: 1451.17927
+  tps: 1469.58778
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-EmeraldWatcherVestments"
  value: {
-  dps: 1532.09538
-  tps: 1550.35639
+  dps: 1528.07496
+  tps: 1546.33596
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 2186.48771
-  tps: 2096.99695
+  dps: 2177.86774
+  tps: 2092.94737
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-FeralheartRaiment"
  value: {
-  dps: 1340.77276
-  tps: 1359.23693
+  dps: 1338.50375
+  tps: 1356.96792
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather"
  value: {
-  dps: 1573.16923
-  tps: 1591.54824
+  dps: 1569.2598
+  tps: 1587.63881
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLeather"
  value: {
-  dps: 1456.73768
-  tps: 1475.14618
+  dps: 1452.13235
+  tps: 1470.54086
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather"
  value: {
-  dps: 1446.36482
-  tps: 1464.61108
+  dps: 1442.53566
+  tps: 1460.78191
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 2300.82196
-  tps: 2219.77534
+  dps: 2291.70806
+  tps: 2214.88086
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4647.5814
-  tps: 4509.42678
+  dps: 4639.68329
+  tps: 4508.29077
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 6890.16739
-  tps: 7177.16117
+  dps: 6876.00734
+  tps: 7169.1715
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 4592.55905
-  tps: 4445.2893
+  dps: 4577.94291
+  tps: 4436.61297
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4415.658
+  dps: 4409.60108
   tps: 4304.88117
  }
 }
@@ -1135,21 +1135,21 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 6879.69443
+  dps: 6874.17876
   tps: 7166.0828
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 4577.95365
+  dps: 4570.67592
   tps: 4427.11928
  }
 }
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4426.62247
+  dps: 4420.70027
   tps: 4314.73624
  }
 }
@@ -1177,7 +1177,7 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 4619.92891
-  tps: 4470.79045
+  dps: 4611.66769
+  tps: 4469.75781
  }
 }
diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
index 0da150c51e..d4e71cb013 100644
--- a/sim/druid/feral/TestFeral.results
+++ b/sim/druid/feral/TestFeral.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestFeral-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 563.64
-  final_stats: 418
+  final_stats: 539.88
+  final_stats: 405.9
   final_stats: 485.76
   final_stats: 289.08
   final_stats: 205.7
@@ -165,21 +165,21 @@ character_stats_results: {
   final_stats: 34.62764
   final_stats: 0
   final_stats: 0
-  final_stats: 3014.28
+  final_stats: 2905.66
   final_stats: 5
-  final_stats: 51.8
+  final_stats: 51.195
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 7300.2
   final_stats: 0
   final_stats: 0
-  final_stats: 2439
+  final_stats: 2414.8
   final_stats: 831
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 25.8
+  final_stats: 25.195
   final_stats: 5
   final_stats: 0
   final_stats: 6783.63
@@ -197,8 +197,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestFeral-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 768.108
-  final_stats: 610.995
+  final_stats: 740.784
+  final_stats: 597.08
   final_stats: 567.3525
   final_stats: 306.636
   final_stats: 236.555
@@ -214,21 +214,21 @@ character_stats_results: {
   final_stats: 33.92082
   final_stats: 0
   final_stats: 0
-  final_stats: 3667.211
+  final_stats: 3549.648
   final_stats: 5
-  final_stats: 60.44975
+  final_stats: 59.754
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 7563.54
   final_stats: 0
   final_stats: 0
-  final_stats: 2954.99
+  final_stats: 2927.16
   final_stats: 902
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 35.44975
+  final_stats: 34.754
   final_stats: 5
   final_stats: 0
   final_stats: 7640.35125
@@ -393,8 +393,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestFeral-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.10467
-  weights: 2.21065
+  weights: 2.09608
+  weights: 1.89174
   weights: 0
   weights: 0
   weights: 0
@@ -410,9 +410,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.79723
+  weights: 0.79397
   weights: 0
-  weights: 24.71307
+  weights: 23.68919
   weights: 0
   weights: 0
   weights: 0
@@ -442,8 +442,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestFeral-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.807
-  weights: 3.02105
+  weights: 2.79802
+  weights: 2.28864
   weights: 0
   weights: 0
   weights: 0
@@ -459,9 +459,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.92457
+  weights: 0.92161
   weights: 0
-  weights: 23.04453
+  weights: 22.27224
   weights: 0
   weights: 0
   weights: 0
@@ -1349,120 +1349,120 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sCracklingLeather"
  value: {
-  dps: 1343.57535
-  tps: 980.75906
+  dps: 1302.78517
+  tps: 951.75771
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sLeather"
  value: {
-  dps: 1392.63952
-  tps: 1015.58235
+  dps: 1350.36522
+  tps: 985.52604
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sRestoredLeather"
  value: {
-  dps: 1313.86358
-  tps: 959.69628
+  dps: 1272.77839
+  tps: 930.48199
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
-  dps: 2080.60847
-  tps: 1494.94247
+  dps: 2019.79264
+  tps: 1451.76323
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldDreamkeeperGarb"
  value: {
-  dps: 1317.87926
-  tps: 962.34999
+  dps: 1277.2505
+  tps: 933.46797
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldLeathers"
  value: {
-  dps: 1385.26594
-  tps: 1010.33717
+  dps: 1343.02397
+  tps: 980.30381
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldWatcherVestments"
  value: {
-  dps: 1324.43436
-  tps: 967.03878
+  dps: 1283.85201
+  tps: 938.18647
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 1941.00447
-  tps: 1404.02085
+  dps: 1883.3624
+  tps: 1363.04948
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-FeralheartRaiment"
  value: {
-  dps: 1423.358
-  tps: 1037.35951
+  dps: 1381.93671
+  tps: 1007.90435
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather"
  value: {
-  dps: 1343.57535
-  tps: 980.75906
+  dps: 1302.78517
+  tps: 951.75771
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLeather"
  value: {
-  dps: 1392.63952
-  tps: 1015.58235
+  dps: 1350.36522
+  tps: 985.52604
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather"
  value: {
-  dps: 1313.86358
-  tps: 959.69628
+  dps: 1272.77839
+  tps: 930.48199
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 1996.44461
-  tps: 1444.68033
+  dps: 1935.9394
+  tps: 1401.6663
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3742.89694
-  tps: 2681.02918
+  dps: 3641.23795
+  tps: 2608.85517
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 16673.53155
-  tps: 12129.94823
+  dps: 16179.55944
+  tps: 11778.09092
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2489.14208
-  tps: 1782.97991
+  dps: 2441.82798
+  tps: 1749.01042
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2769.27399
-  tps: 1978.4312
+  dps: 2720.52557
+  tps: 1943.82153
  }
 }
 dps_results: {
@@ -1489,22 +1489,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 16673.53155
-  tps: 12129.94823
+  dps: 16179.55944
+  tps: 11778.09092
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2489.14208
-  tps: 1782.97991
+  dps: 2441.82798
+  tps: 1749.01042
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2769.27399
-  tps: 1978.4312
+  dps: 2720.52557
+  tps: 1943.82153
  }
 }
 dps_results: {
@@ -1531,22 +1531,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 16673.53155
-  tps: 12129.94823
+  dps: 16179.55944
+  tps: 11778.09092
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2489.14208
-  tps: 1782.97991
+  dps: 2441.82798
+  tps: 1749.01042
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2769.27399
-  tps: 1978.4312
+  dps: 2720.52557
+  tps: 1943.82153
  }
 }
 dps_results: {
@@ -1573,22 +1573,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 17593.03182
-  tps: 12782.99788
+  dps: 17044.30157
+  tps: 12393.08695
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2627.41365
-  tps: 1881.03903
+  dps: 2554.78161
+  tps: 1829.42196
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2922.47056
-  tps: 2087.1521
+  dps: 2845.11872
+  tps: 2032.23229
  }
 }
 dps_results: {
@@ -1615,22 +1615,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 17593.03182
-  tps: 12782.99788
+  dps: 17044.30157
+  tps: 12393.08695
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2627.41365
-  tps: 1881.03903
+  dps: 2554.78161
+  tps: 1829.42196
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2922.47056
-  tps: 2087.1521
+  dps: 2845.11872
+  tps: 2032.23229
  }
 }
 dps_results: {
@@ -1657,22 +1657,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 17593.03182
-  tps: 12782.99788
+  dps: 17044.30157
+  tps: 12393.08695
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2627.41365
-  tps: 1881.03903
+  dps: 2554.78161
+  tps: 1829.42196
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2922.47056
-  tps: 2087.1521
+  dps: 2845.11872
+  tps: 2032.23229
  }
 }
 dps_results: {
@@ -1699,127 +1699,127 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2787.75232
-  tps: 1990.99134
+  dps: 2707.17961
+  tps: 1933.86189
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sCracklingLeather"
  value: {
-  dps: 1444.77145
-  tps: 1051.78144
+  dps: 1398.66625
+  tps: 1019.01578
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sLeather"
  value: {
-  dps: 1499.79446
-  tps: 1091.2999
+  dps: 1453.6287
+  tps: 1058.47918
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sRestoredLeather"
  value: {
-  dps: 1414.72148
-  tps: 1030.39434
+  dps: 1371.0799
+  tps: 999.33842
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
-  dps: 2412.62811
-  tps: 1730.42193
+  dps: 2345.74649
+  tps: 1682.93598
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldDreamkeeperGarb"
  value: {
-  dps: 1420.57464
-  tps: 1034.76525
+  dps: 1375.4238
+  tps: 1002.66922
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldLeathers"
  value: {
-  dps: 1492.37449
-  tps: 1086.02174
+  dps: 1446.24158
+  tps: 1053.22436
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldWatcherVestments"
  value: {
-  dps: 1427.24915
-  tps: 1039.46688
+  dps: 1381.85895
+  tps: 1007.20411
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 2253.24195
-  tps: 1624.85661
+  dps: 2188.47185
+  tps: 1578.82803
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-FeralheartRaiment"
  value: {
-  dps: 1524.02243
-  tps: 1106.8956
+  dps: 1477.80646
+  tps: 1074.04537
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather"
  value: {
-  dps: 1444.77145
-  tps: 1051.78144
+  dps: 1398.66625
+  tps: 1019.01578
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLeather"
  value: {
-  dps: 1499.79446
-  tps: 1091.2999
+  dps: 1453.6287
+  tps: 1058.47918
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather"
  value: {
-  dps: 1414.72148
-  tps: 1030.39434
+  dps: 1371.0799
+  tps: 999.33842
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 2299.48392
-  tps: 1658.45267
+  dps: 2232.54168
+  tps: 1610.83558
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4744.55964
-  tps: 3391.44979
+  dps: 4620.61451
+  tps: 3303.44784
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3492.7072
-  tps: 2748.74796
+  dps: 3383.73372
+  tps: 2678.48454
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3451.54636
-  tps: 2465.80894
+  dps: 3342.275
+  tps: 2389.11331
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3788.71831
-  tps: 2701.94816
+  dps: 3666.77541
+  tps: 2615.37211
  }
 }
 dps_results: {
@@ -1846,22 +1846,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3492.7072
-  tps: 2748.74796
+  dps: 3383.73372
+  tps: 2678.48454
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3451.54636
-  tps: 2465.80894
+  dps: 3342.275
+  tps: 2389.11331
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3788.71831
-  tps: 2701.94816
+  dps: 3666.77541
+  tps: 2615.37211
  }
 }
 dps_results: {
@@ -1888,22 +1888,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3492.7072
-  tps: 2748.74796
+  dps: 3383.73372
+  tps: 2678.48454
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3451.54636
-  tps: 2465.80894
+  dps: 3342.275
+  tps: 2389.11331
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3788.71831
-  tps: 2701.94816
+  dps: 3666.77541
+  tps: 2615.37211
  }
 }
 dps_results: {
@@ -1930,22 +1930,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3482.17973
-  tps: 2751.23861
+  dps: 3385.53835
+  tps: 2682.54828
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3441.04075
-  tps: 2459.50918
+  dps: 3344.39937
+  tps: 2390.75252
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3781.95793
-  tps: 2697.1556
+  dps: 3678.15008
+  tps: 2623.45202
  }
 }
 dps_results: {
@@ -1972,22 +1972,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3482.17973
-  tps: 2751.23861
+  dps: 3385.53835
+  tps: 2682.54828
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3441.04075
-  tps: 2459.50918
+  dps: 3344.39937
+  tps: 2390.75252
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3781.95793
-  tps: 2697.1556
+  dps: 3678.15008
+  tps: 2623.45202
  }
 }
 dps_results: {
@@ -2014,22 +2014,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3482.17973
-  tps: 2751.23861
+  dps: 3385.53835
+  tps: 2682.54828
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3441.04075
-  tps: 2459.50918
+  dps: 3344.39937
+  tps: 2390.75252
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3781.95793
-  tps: 2697.1556
+  dps: 3678.15008
+  tps: 2623.45202
  }
 }
 dps_results: {
@@ -2056,7 +2056,7 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3427.15777
-  tps: 2443.54839
+  dps: 3339.81786
+  tps: 2381.56306
  }
 }
diff --git a/sim/druid/starfire.go b/sim/druid/starfire.go
index 5bbc7fe8c2..45a3969dc1 100644
--- a/sim/druid/starfire.go
+++ b/sim/druid/starfire.go
@@ -17,7 +17,11 @@ var StarfireLevel = [StarfireRanks + 1]int{0, 20, 26, 34, 42, 50, 58, 60}
 func (druid *Druid) registerStarfireSpell() {
 	druid.Starfire = make([]*DruidSpell, StarfireRanks+1)
 
-	maxRank := core.TernaryInt(core.IncludeAQ, StarfireRanks, StarfireRanks-1)
+	maxRank := StarfireRanks
+	if !druid.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
 	for rank := 1; rank <= maxRank; rank++ {
 		config := druid.newStarfireSpellConfig(rank)
 
diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
index f8ac32e82f..3235ff52b9 100644
--- a/sim/hunter/TestMM.results
+++ b/sim/hunter/TestMM.results
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestMM-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 260.15
-  final_stats: 713.9
+  final_stats: 238.37
+  final_stats: 700.59
   final_stats: 576.081
   final_stats: 219.01
   final_stats: 177.87
@@ -67,17 +67,17 @@ character_stats_results: {
   final_stats: 40.21367
   final_stats: 0
   final_stats: 0
-  final_stats: 2023.05
+  final_stats: 1938.96
   final_stats: 6
-  final_stats: 50.49271
+  final_stats: 50.24115
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 4725.15
   final_stats: 0
   final_stats: 0
-  final_stats: 3901.8
-  final_stats: 2603.8
+  final_stats: 3875.18
+  final_stats: 2577.18
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -149,7 +149,7 @@ stat_weights_results: {
  key: "TestMM-Phase4-Lvl60-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.52119
+  weights: 0.51197
   weights: 0
   weights: 0
   weights: 0
@@ -165,9 +165,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.19892
+  weights: 0.19868
   weights: 0
-  weights: 4.90375
+  weights: 4.95013
   weights: 0
   weights: 0
   weights: 0
@@ -309,216 +309,216 @@ dps_results: {
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-BeastmasterArmor"
  value: {
-  dps: 551.2998
-  tps: 551.41051
+  dps: 539.08546
+  tps: 539.19223
   hps: 10.10534
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-BloodGuard'sChain"
  value: {
-  dps: 749.90036
-  tps: 750.01081
+  dps: 740.99094
+  tps: 741.09771
   hps: 10.05412
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-BloodlashBow-216516"
  value: {
-  dps: 873.84069
-  tps: 873.95114
+  dps: 858.29573
+  tps: 858.4025
   hps: 13.05826
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-DevilsaurEye-19991"
  value: {
-  dps: 872.84826
-  tps: 872.95871
+  dps: 858.00283
+  tps: 858.1096
   hps: 13.05826
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-DevilsaurTooth-19992"
  value: {
-  dps: 865.94683
-  tps: 866.05728
+  dps: 851.10139
+  tps: 851.20816
   hps: 13.05826
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-DreadHunter'sChain"
  value: {
-  dps: 643.41364
-  tps: 643.52409
+  dps: 631.3238
+  tps: 631.43425
   hps: 9.63591
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-GurubashiPitFighter'sBow-221450"
  value: {
-  dps: 875.32463
-  tps: 875.43508
+  dps: 859.77776
+  tps: 859.88453
   hps: 13.05826
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-Knight-Lieutenant'sChain"
  value: {
-  dps: 749.90036
-  tps: 750.01081
+  dps: 740.99094
+  tps: 741.09771
   hps: 10.05412
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-Maelstrom'sWrath-231320"
  value: {
-  dps: 875.87563
-  tps: 875.98608
+  dps: 859.42246
+  tps: 859.52922
   hps: 12.90919
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 861.75744
-  tps: 861.86789
+  dps: 846.23339
+  tps: 846.34015
   hps: 13.05826
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sBelt-231322"
  value: {
-  dps: 823.14755
-  tps: 823.258
+  dps: 807.69299
+  tps: 807.79976
   hps: 13.05826
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sBracers-231323"
  value: {
-  dps: 747.22255
-  tps: 747.333
+  dps: 728.79679
+  tps: 728.90355
   hps: 13.05826
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sMantle-231321"
  value: {
-  dps: 859.12713
-  tps: 859.23758
+  dps: 843.9161
+  tps: 844.02287
   hps: 13.05826
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 882.2824
-  tps: 882.40141
+  dps: 866.59663
+  tps: 866.71072
   hps: 13.07849
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4680.01463
-  tps: 5334.38396
-  hps: 17.71737
+  dps: 5158.88569
+  tps: 5821.59776
+  hps: 18.18481
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2698.53775
-  tps: 2731.21431
-  hps: 17.92142
+  dps: 3140.6587
+  tps: 3173.76512
+  hps: 18.15921
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2667.58565
-  tps: 2698.90083
-  hps: 16.2045
+  dps: 3138.19129
+  tps: 3170.78524
+  hps: 17.51273
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2431.2512
-  tps: 3052.97629
-  hps: 9.23821
+  dps: 2664.69607
+  tps: 3265.6733
+  hps: 9.54886
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1257.5962
-  tps: 1288.68245
-  hps: 9.30873
+  dps: 1466.64292
+  tps: 1496.69178
+  hps: 9.57206
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Dwarf-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1319.82215
-  tps: 1343.55002
-  hps: 8.92667
+  dps: 1541.38806
+  tps: 1565.11594
+  hps: 9.6408
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5051.80858
-  tps: 5688.85924
-  hps: 17.7196
+  dps: 5611.57671
+  tps: 6210.79839
+  hps: 18.21869
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2868.17158
-  tps: 2900.09936
-  hps: 17.66612
+  dps: 3163.62843
+  tps: 3193.61453
+  hps: 18.3618
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2938.84718
-  tps: 2970.17843
-  hps: 15.94173
+  dps: 3142.92773
+  tps: 3173.89826
+  hps: 17.22877
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2432.3139
-  tps: 3027.07006
-  hps: 9.34711
+  dps: 2643.63507
+  tps: 3224.35004
+  hps: 9.52118
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1241.14115
-  tps: 1270.87896
-  hps: 9.36407
+  dps: 1434.77818
+  tps: 1463.81393
+  hps: 9.45155
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-Settings-Orc-p4_ranged-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1337.00706
-  tps: 1360.73493
-  hps: 8.74813
+  dps: 1462.71687
+  tps: 1485.67074
+  hps: 9.46227
  }
 }
 dps_results: {
  key: "TestMM-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 731.04243
-  tps: 731.15261
+  dps: 720.60525
+  tps: 720.7107
   hps: 11.07677
  }
 }
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
index 329e091c96..bfff1142d1 100644
--- a/sim/hunter/TestSV.results
+++ b/sim/hunter/TestSV.results
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestSV-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 360.58
-  final_stats: 782.023
+  final_stats: 338.8
+  final_stats: 766.7165
   final_stats: 546.8595
   final_stats: 205.7
   final_stats: 177.87
@@ -67,17 +67,17 @@ character_stats_results: {
   final_stats: 39.99405
   final_stats: 0
   final_stats: 0
-  final_stats: 2163.603
+  final_stats: 2077.5165
   final_stats: 6
-  final_stats: 51.78023
+  final_stats: 51.49094
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 4525.5
   final_stats: 0
   final_stats: 0
-  final_stats: 4050.046
-  final_stats: 2512.046
+  final_stats: 4019.433
+  final_stats: 2481.433
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -149,7 +149,7 @@ stat_weights_results: {
  key: "TestSV-Phase4-Lvl60-StatWeights-Default"
  value: {
   weights: 0
-  weights: 2.96835
+  weights: 2.77372
   weights: 0
   weights: 0
   weights: 0
@@ -165,9 +165,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.39601
+  weights: 0.39074
   weights: 0
-  weights: 20.54013
+  weights: 20.36579
   weights: 0
   weights: 0
   weights: 0
@@ -175,7 +175,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.4384
+  weights: 0.44128
   weights: 0
   weights: 0
   weights: 0
@@ -309,216 +309,216 @@ dps_results: {
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-BeastmasterArmor"
  value: {
-  dps: 1052.50217
-  tps: 827.28501
+  dps: 1048.60532
+  tps: 829.78637
   hps: 14.05876
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-BloodGuard'sChain"
  value: {
-  dps: 1182.25899
-  tps: 934.2052
+  dps: 1177.54813
+  tps: 936.73944
   hps: 14.05876
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-BloodlashBow-216516"
  value: {
-  dps: 1606.85657
-  tps: 1613.91994
+  dps: 1638.40327
+  tps: 1645.98057
   hps: 13.51585
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurEye-19991"
  value: {
-  dps: 3241.19065
-  tps: 2856.5705
+  dps: 3228.31741
+  tps: 2853.95479
   hps: 20.21352
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurTooth-19992"
  value: {
-  dps: 3214.92863
-  tps: 2833.3991
+  dps: 3202.11648
+  tps: 2830.84448
   hps: 20.21352
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-DreadHunter'sChain"
  value: {
-  dps: 1844.25977
-  tps: 1580.53683
+  dps: 1848.24881
+  tps: 1591.90861
   hps: 15.28197
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-GurubashiPitFighter'sBow-221450"
  value: {
-  dps: 1640.35797
-  tps: 1647.42134
+  dps: 1671.85963
+  tps: 1679.43694
   hps: 13.51585
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-Knight-Lieutenant'sChain"
  value: {
-  dps: 1182.25899
-  tps: 934.2052
+  dps: 1177.54813
+  tps: 936.73944
   hps: 14.05876
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-Maelstrom'sWrath-231320"
  value: {
-  dps: 3262.11155
-  tps: 2882.01225
+  dps: 3253.80727
+  tps: 2883.91734
   hps: 19.89415
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 3178.51567
-  tps: 2802.96097
+  dps: 3169.97466
+  tps: 2804.95075
   hps: 20.28722
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sBelt-231322"
  value: {
-  dps: 2911.18127
-  tps: 2573.16375
+  dps: 2909.23186
+  tps: 2580.19605
   hps: 19.62477
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sBracers-231323"
  value: {
-  dps: 3057.49786
-  tps: 2691.23148
+  dps: 3045.25113
+  tps: 2689.5146
   hps: 19.62477
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sMantle-231321"
  value: {
-  dps: 3141.57793
-  tps: 2776.03883
+  dps: 3133.54646
+  tps: 2777.87897
   hps: 19.62477
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3245.85267
-  tps: 2862.63447
+  dps: 3235.19434
+  tps: 2862.19972
   hps: 19.97449
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4944.79446
-  tps: 4960.56653
-  hps: 20.1602
+  dps: 5004.87075
+  tps: 5031.82349
+  hps: 20.26521
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2986.42493
-  tps: 2611.68776
-  hps: 20.22776
+  dps: 3287.74091
+  tps: 2934.63268
+  hps: 20.29898
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2986.23838
-  tps: 2618.26971
-  hps: 19.45383
+  dps: 3304.66477
+  tps: 2969.68916
+  hps: 19.36469
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3318.44207
-  tps: 3567.46733
-  hps: 10.55617
+  dps: 3559.74577
+  tps: 3811.46012
+  hps: 10.56444
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1500.39661
-  tps: 1336.22272
-  hps: 10.37596
+  dps: 1676.27874
+  tps: 1512.11484
+  hps: 10.33182
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1508.55008
-  tps: 1326.72925
-  hps: 10.66558
+  dps: 1703.49631
+  tps: 1524.48943
+  hps: 10.57364
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5229.66353
-  tps: 5227.73017
-  hps: 20.20319
+  dps: 4891.26849
+  tps: 4874.55087
+  hps: 20.18229
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3162.41039
-  tps: 2777.25348
-  hps: 20.22469
+  dps: 3448.17507
+  tps: 3079.70924
+  hps: 19.9704
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3225.74417
-  tps: 2849.98451
-  hps: 19.02391
+  dps: 3518.99677
+  tps: 3139.60928
+  hps: 18.6891
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3311.53884
-  tps: 3556.98708
-  hps: 10.37596
+  dps: 3582.2438
+  tps: 3824.56515
+  hps: 10.33182
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1502.57872
-  tps: 1337.49305
-  hps: 10.37688
+  dps: 1667.90906
+  tps: 1505.25026
+  hps: 10.45871
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1543.23597
-  tps: 1360.60771
-  hps: 10.57364
+  dps: 1733.95773
+  tps: 1542.06935
+  hps: 10.43572
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3019.2061
-  tps: 2719.86715
+  dps: 3015.87089
+  tps: 2724.25583
   hps: 19.59929
  }
 }
diff --git a/sim/hunter/aspects.go b/sim/hunter/aspects.go
index 8ff760cf6a..f15b06a12e 100644
--- a/sim/hunter/aspects.go
+++ b/sim/hunter/aspects.go
@@ -44,7 +44,10 @@ func (hunter *Hunter) getMaxAspectOfTheHawkAttackPower(rank int) float64 {
 }
 
 func (hunter *Hunter) getMaxHawkRank() int {
-	maxRank := core.TernaryInt(core.IncludeAQ, 7, 6)
+	maxRank := 7
+	if !hunter.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
 
 	for i := maxRank; i > 0; i-- {
 		config := hunter.getAspectOfTheHawkSpellConfig(i)
diff --git a/sim/hunter/multi_shot.go b/sim/hunter/multi_shot.go
index 9190b7bc8e..2386f9ccbb 100644
--- a/sim/hunter/multi_shot.go
+++ b/sim/hunter/multi_shot.go
@@ -101,7 +101,11 @@ func (hunter *Hunter) getMultiShotConfig(rank int, timer *core.Timer) core.Spell
 }
 
 func (hunter *Hunter) registerMultiShotSpell(timer *core.Timer) {
-	maxRank := core.TernaryInt(core.IncludeAQ, 5, 4)
+	maxRank := 5
+	if !hunter.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
 	for rank := 1; rank <= maxRank; rank++ {
 		config := hunter.getMultiShotConfig(rank, timer)
 
diff --git a/sim/hunter/serpent_sting.go b/sim/hunter/serpent_sting.go
index 4010732742..f03473b040 100644
--- a/sim/hunter/serpent_sting.go
+++ b/sim/hunter/serpent_sting.go
@@ -112,7 +112,11 @@ func (hunter *Hunter) chimeraShotSerpentStingSpell(rank int) *core.Spell {
 func (hunter *Hunter) registerSerpentStingSpell() {
 	hunter.SerpentStingAPCoeff = 0
 
-	maxRank := core.TernaryInt(core.IncludeAQ, 9, 8)
+	maxRank := 9
+	if !hunter.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
 	for rank := maxRank; rank >= 0; rank-- {
 		config := hunter.getSerpentStingConfig(rank)
 
diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
index b4b34b110a..b3820905c8 100644
--- a/sim/mage/TestArcane.results
+++ b/sim/mage/TestArcane.results
@@ -99,8 +99,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestArcane-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 169.4
-  final_stats: 176
+  final_stats: 149.6
+  final_stats: 163.9
   final_stats: 388.355
   final_stats: 388.3
   final_stats: 215.6
@@ -116,7 +116,7 @@ character_stats_results: {
   final_stats: 48.72344
   final_stats: 0
   final_stats: 0
-  final_stats: 989.4
+  final_stats: 920.6
   final_stats: 3
   final_stats: 22.2
   final_stats: 0
@@ -125,7 +125,7 @@ character_stats_results: {
   final_stats: 7433.25
   final_stats: 0
   final_stats: 0
-  final_stats: 984
+  final_stats: 959.8
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestArcane-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 194.81
-  final_stats: 202.4
+  final_stats: 172.04
+  final_stats: 188.485
   final_stats: 538.2575
   final_stats: 487.025
   final_stats: 297.275
@@ -165,7 +165,7 @@ character_stats_results: {
   final_stats: 35.38202
   final_stats: 0
   final_stats: 0
-  final_stats: 1014.81
+  final_stats: 943.04
   final_stats: 3
   final_stats: 21.2
   final_stats: 0
@@ -174,7 +174,7 @@ character_stats_results: {
   final_stats: 9062.2125
   final_stats: 0
   final_stats: 0
-  final_stats: 1111.8
+  final_stats: 1083.97
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -659,15 +659,15 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1904.70597
-  tps: 2309.82013
+  dps: 1922.27562
+  tps: 2327.78311
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1904.70597
-  tps: 1924.96168
+  dps: 1922.27562
+  tps: 1942.551
  }
 }
 dps_results: {
@@ -821,21 +821,21 @@ dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
   dps: 7487.77714
-  tps: 4892.48094
+  tps: 4892.58523
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
   dps: 3239.26957
-  tps: 2084.41606
+  tps: 2084.42128
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
   dps: 3953.65536
-  tps: 2609.39122
+  tps: 2610.24566
  }
 }
 dps_results: {
diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
index 619caac9c5..67e37a3ec8 100644
--- a/sim/mage/TestFire.results
+++ b/sim/mage/TestFire.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestFire-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 169.4
-  final_stats: 176
+  final_stats: 149.6
+  final_stats: 163.9
   final_stats: 371.91
   final_stats: 383.9
   final_stats: 215.6
@@ -165,7 +165,7 @@ character_stats_results: {
   final_stats: 49.64952
   final_stats: 0
   final_stats: 0
-  final_stats: 989.4
+  final_stats: 920.6
   final_stats: 3
   final_stats: 23.2
   final_stats: 0
@@ -174,7 +174,7 @@ character_stats_results: {
   final_stats: 6691.5
   final_stats: 0
   final_stats: 0
-  final_stats: 969
+  final_stats: 944.8
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -197,8 +197,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestFire-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 194.81
-  final_stats: 202.4
+  final_stats: 172.04
+  final_stats: 188.485
   final_stats: 548.44075
   final_stats: 499.675
   final_stats: 313.72
@@ -214,7 +214,7 @@ character_stats_results: {
   final_stats: 42.59454
   final_stats: 0
   final_stats: 0
-  final_stats: 1014.81
+  final_stats: 943.04
   final_stats: 3
   final_stats: 28.2
   final_stats: 0
@@ -223,7 +223,7 @@ character_stats_results: {
   final_stats: 8428.125
   final_stats: 0
   final_stats: 0
-  final_stats: 1137.8
+  final_stats: 1109.97
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -813,8 +813,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 601.20294
-  tps: 575.07777
+  dps: 605.80939
+  tps: 578.73357
  }
 }
 dps_results: {
@@ -841,8 +841,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-Sorcerer'sRegalia"
  value: {
-  dps: 791.29152
-  tps: 753.27231
+  dps: 796.87923
+  tps: 758.7571
  }
 }
 dps_results: {
@@ -855,15 +855,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2839.4951
-  tps: 2313.91629
+  dps: 2855.85618
+  tps: 2326.52781
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2839.4951
-  tps: 1863.47751
+  dps: 2855.85618
+  tps: 1874.99756
  }
 }
 dps_results: {
@@ -1016,22 +1016,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 1310.56355
-  tps: 1083.38284
+  dps: 1282.97578
+  tps: 1063.46075
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3597.20201
-  tps: 2075.62766
+  dps: 3553.86955
+  tps: 2048.93724
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4431.44902
-  tps: 2552.73955
+  dps: 4429.20628
+  tps: 2551.45024
  }
 }
 dps_results: {
diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
index 2d91af0c14..34c321b0a8 100644
--- a/sim/mage/TestFrost.results
+++ b/sim/mage/TestFrost.results
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestFrost-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 169.4
-  final_stats: 176
+  final_stats: 149.6
+  final_stats: 163.9
   final_stats: 388.355
   final_stats: 396
   final_stats: 215.6
@@ -67,7 +67,7 @@ character_stats_results: {
   final_stats: 36.8528
   final_stats: 0
   final_stats: 0
-  final_stats: 989.4
+  final_stats: 920.6
   final_stats: 4
   final_stats: 23.2
   final_stats: 0
@@ -76,7 +76,7 @@ character_stats_results: {
   final_stats: 6873
   final_stats: 0
   final_stats: 0
-  final_stats: 984
+  final_stats: 959.8
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -99,8 +99,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestFrost-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 194.81
-  final_stats: 202.4
+  final_stats: 172.04
+  final_stats: 188.485
   final_stats: 560.07875
   final_stats: 511.06
   final_stats: 318.78
@@ -116,7 +116,7 @@ character_stats_results: {
   final_stats: 38.78581
   final_stats: 0
   final_stats: 0
-  final_stats: 1014.81
+  final_stats: 943.04
   final_stats: 3
   final_stats: 24.2
   final_stats: 0
@@ -125,7 +125,7 @@ character_stats_results: {
   final_stats: 8598.9
   final_stats: 0
   final_stats: 0
-  final_stats: 1111.8
+  final_stats: 1083.97
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -200,18 +200,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.91556
+  weights: 3.99159
   weights: 0
-  weights: 2.00455
+  weights: 2.00288
   weights: 0
-  weights: 1.79787
-  weights: 0.20668
+  weights: 1.79118
+  weights: 0.21169
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 25.96351
+  weights: 27.96603
   weights: 0
   weights: 0
   weights: 0
@@ -421,8 +421,8 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 675.3223
-  tps: 535.57695
+  dps: 676.43918
+  tps: 535.96249
  }
 }
 dps_results: {
@@ -449,50 +449,50 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-Sorcerer'sRegalia"
  value: {
-  dps: 836.66303
-  tps: 666.18892
+  dps: 838.25165
+  tps: 667.19588
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 2801.54463
-  tps: 2297.68476
+  dps: 2800.33442
+  tps: 2295.99319
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2842.77987
-  tps: 2752.23481
+  dps: 2838.81412
+  tps: 2747.77744
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2842.77987
-  tps: 2330.76171
+  dps: 2838.81412
+  tps: 2327.48076
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3157.33962
-  tps: 2579.5317
+  tps: 2579.5419
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 792.19163
-  tps: 878.48322
+  dps: 791.27737
+  tps: 877.41645
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 792.19163
-  tps: 646.92932
+  dps: 791.27737
+  tps: 646.00851
  }
 }
 dps_results: {
@@ -505,15 +505,15 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2827.52965
-  tps: 2732.527
+  dps: 2820.23117
+  tps: 2725.35509
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2827.52965
-  tps: 2317.74475
+  dps: 2820.23117
+  tps: 2311.11183
  }
 }
 dps_results: {
@@ -526,15 +526,15 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 781.30191
-  tps: 867.41227
+  dps: 784.43066
+  tps: 869.26225
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 781.30191
-  tps: 636.59944
+  dps: 784.43066
+  tps: 638.49996
  }
 }
 dps_results: {
@@ -547,8 +547,8 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2803.56619
-  tps: 2298.48108
+  dps: 2800.44788
+  tps: 2295.50472
  }
 }
 dps_results: {
@@ -625,14 +625,14 @@ dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
   dps: 7510.27433
-  tps: 3514.88072
+  tps: 3521.49873
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
   dps: 3270.40196
-  tps: 1473.77151
+  tps: 1474.10241
  }
 }
 dps_results: {
diff --git a/sim/mage/arcane_missiles.go b/sim/mage/arcane_missiles.go
index 55d62a8099..c1c5d69bd5 100644
--- a/sim/mage/arcane_missiles.go
+++ b/sim/mage/arcane_missiles.go
@@ -21,8 +21,12 @@ func (mage *Mage) registerArcaneMissilesSpell() {
 	mage.ArcaneMissiles = make([]*core.Spell, ArcaneMissilesRanks+1)
 	mage.ArcaneMissilesTickSpell = make([]*core.Spell, ArcaneMissilesRanks+1)
 
-	// TODO AQ <=
-	for rank := 1; rank < ArcaneMissilesRanks; rank++ {
+	maxRank := ArcaneMissilesRanks
+	if !mage.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
+	for rank := 1; rank <= maxRank; rank++ {
 		config := mage.getArcaneMissilesSpellConfig(rank)
 
 		if config.RequiredLevel <= int(mage.Level) {
diff --git a/sim/mage/fireball.go b/sim/mage/fireball.go
index 9fe514d2f1..dffed1b58c 100644
--- a/sim/mage/fireball.go
+++ b/sim/mage/fireball.go
@@ -20,7 +20,11 @@ var FireballLevel = [FireballRanks + 1]int{0, 1, 6, 12, 18, 24, 30, 36, 42, 48,
 func (mage *Mage) registerFireballSpell() {
 	mage.Fireball = make([]*core.Spell, FireballRanks+1)
 
-	maxRank := core.TernaryInt(core.IncludeAQ, FireballRanks, FireballRanks-1)
+	maxRank := FireballRanks
+	if !mage.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
 	for rank := 1; rank <= maxRank; rank++ {
 		config := mage.newFireballSpellConfig(rank)
 
diff --git a/sim/mage/frostbolt.go b/sim/mage/frostbolt.go
index fd4c0421fd..0b97538d3d 100644
--- a/sim/mage/frostbolt.go
+++ b/sim/mage/frostbolt.go
@@ -18,7 +18,11 @@ var FrostboltLevel = [FrostboltRanks + 1]int{0, 4, 8, 14, 20, 26, 32, 38, 44, 50
 func (mage *Mage) registerFrostboltSpell() {
 	mage.Frostbolt = make([]*core.Spell, FrostboltRanks+1)
 
-	maxRank := core.TernaryInt(core.IncludeAQ, FrostboltRanks, FrostboltRanks-1)
+	maxRank := FrostboltRanks
+	if !mage.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
 	for rank := 1; rank <= maxRank; rank++ {
 		config := mage.getFrostboltConfig(rank)
 
diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results
index 4fa606e8d0..d3918b5ecf 100644
--- a/sim/paladin/protection/TestProtection.results
+++ b/sim/paladin/protection/TestProtection.results
@@ -13,12 +13,12 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 4
   final_stats: 26.99832
   final_stats: 0
   final_stats: 0
-  final_stats: 1947.2
+  final_stats: 1862.2
   final_stats: 7
   final_stats: 30.1622
   final_stats: 0
@@ -51,7 +51,7 @@ stat_weights_results: {
  key: "TestProtection-Phase4-Lvl60-StatWeights-Default"
  value: {
   weights: 0.91087
-  weights: 1.03274
+  weights: 1.01266
   weights: 0
   weights: 0.00071
   weights: 0
@@ -63,14 +63,14 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.66892
-  weights: 1.61062
+  weights: 2.65868
+  weights: 1.5981
   weights: 0
   weights: 0
   weights: 0.40238
   weights: 0
-  weights: 15.5099
-  weights: 9.74475
+  weights: 15.18654
+  weights: 9.47877
   weights: 0
   weights: 0
   weights: 0
@@ -99,99 +99,99 @@ stat_weights_results: {
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1309.84314
-  tps: 2329.80932
+  dps: 1276.55423
+  tps: 2271.34843
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
-  dps: 1692.48093
-  tps: 3424.97994
+  dps: 1658.12764
+  tps: 3357.11966
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1310.04906
-  tps: 2330.5869
+  dps: 1276.76015
+  tps: 2272.14372
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1381.41684
-  tps: 2452.59131
+  dps: 1348.12793
+  tps: 2394.18417
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
-  dps: 1719.142
-  tps: 3482.49535
+  dps: 1684.55577
+  tps: 3413.93337
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 1480.16542
-  tps: 2946.56335
+  dps: 1445.23043
+  tps: 2877.91064
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 1719.142
-  tps: 3482.49535
+  dps: 1684.55577
+  tps: 3413.93337
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1117.96862
-  tps: 1689.22632
+  dps: 1088.54039
+  tps: 1647.1778
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
-  dps: 1496.08664
-  tps: 3040.52826
+  dps: 1460.63499
+  tps: 2970.25969
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
-  dps: 1667.62362
-  tps: 3384.30959
+  dps: 1633.18745
+  tps: 3315.87469
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 1707.18079
-  tps: 3459.31792
+  dps: 1673.04795
+  tps: 3391.61921
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 681.83431
-  tps: 2070.54521
+  dps: 673.3976
+  tps: 2044.00246
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 269.39149
-  tps: 826.88154
+  dps: 262.92319
+  tps: 805.04002
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 523.06955
-  tps: 1502.34047
+  dps: 513.31757
+  tps: 1465.73997
  }
 }
 dps_results: {
@@ -218,22 +218,22 @@ dps_results: {
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 691.99183
-  tps: 2102.47752
+  dps: 689.59901
+  tps: 2101.46646
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 276.60478
-  tps: 842.72187
+  dps: 267.98936
+  tps: 825.58496
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 528.32577
-  tps: 1515.64655
+  dps: 521.76175
+  tps: 1501.8474
  }
 }
 dps_results: {
@@ -260,7 +260,7 @@ dps_results: {
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1415.97022
-  tps: 2865.5984
+  dps: 1388.44273
+  tps: 2811.43715
  }
 }
diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results
index 06d00acaf8..3103f7701a 100644
--- a/sim/paladin/retribution/TestExodin.results
+++ b/sim/paladin/retribution/TestExodin.results
@@ -13,12 +13,12 @@ character_stats_results: {
   final_stats: 127
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 4
   final_stats: 38.21876
   final_stats: 0
   final_stats: 0
-  final_stats: 2424.8
+  final_stats: 2339.8
   final_stats: 7
   final_stats: 41.21786
   final_stats: 0
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestExodin-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 826.551
-  final_stats: 361.79
+  final_stats: 800.32123
+  final_stats: 337.94475
   final_stats: 619.7235
   final_stats: 172.04
   final_stats: 199.2375
@@ -62,26 +62,26 @@ character_stats_results: {
   final_stats: 127
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 4
   final_stats: 41.37307
   final_stats: 0
   final_stats: 0
-  final_stats: 2792.102
+  final_stats: 2690.64245
   final_stats: 7
-  final_stats: 52.00657
+  final_stats: 50.8
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 3812.6
   final_stats: 0
   final_stats: 0
-  final_stats: 6089.58
+  final_stats: 6041.8895
   final_stats: 889
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 19.00657
+  final_stats: 17.8
   final_stats: 5
   final_stats: 0
   final_stats: 7698.235
@@ -100,7 +100,7 @@ stat_weights_results: {
  key: "TestExodin-Phase4-Lvl60-StatWeights-Default"
  value: {
   weights: 2.08944
-  weights: 1.32219
+  weights: 1.2961
   weights: 0
   weights: 0
   weights: 0
@@ -112,13 +112,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 9.64458
-  weights: 1.75293
+  weights: 9.50439
+  weights: 1.72325
   weights: 0
   weights: 0
   weights: 0.86341
   weights: 0
-  weights: 20.55232
+  weights: 20.09211
   weights: 0
   weights: 0
   weights: 0
@@ -148,12 +148,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestExodin-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.92389
-  weights: 1.33437
+  weights: 2.90182
+  weights: 0.81746
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.9338
+  weights: 0.92663
   weights: 0
   weights: 0
   weights: 0
@@ -161,13 +161,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 17.35673
-  weights: 2.74674
+  weights: 13.30928
+  weights: 2.54617
   weights: 0
   weights: 0
-  weights: 1.05063
+  weights: 1.04269
   weights: 0
-  weights: 31.40756
+  weights: 26.39886
   weights: 0
   weights: 0
   weights: 0
@@ -197,99 +197,99 @@ stat_weights_results: {
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1364.96806
-  tps: 1400.16796
+  dps: 1326.608
+  tps: 1361.96891
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
-  dps: 3262.34247
-  tps: 3294.89201
+  dps: 3189.09773
+  tps: 3221.76272
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1365.11214
-  tps: 1401.16748
+  dps: 1326.748
+  tps: 1362.99573
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1464.15123
-  tps: 1501.5096
+  dps: 1425.79117
+  tps: 1463.37151
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
-  dps: 3307.06545
-  tps: 3339.12982
+  dps: 3233.17656
+  tps: 3265.36184
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 1608.39591
-  tps: 1646.14201
+  dps: 1565.77794
+  tps: 1603.7289
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 3178.78892
-  tps: 3210.93769
+  dps: 3107.26375
+  tps: 3139.52789
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1240.02823
-  tps: 1276.52587
+  dps: 1209.71744
+  tps: 1246.41187
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
-  dps: 1443.71624
-  tps: 1481.57599
+  dps: 1409.35011
+  tps: 1447.41914
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
-  dps: 1691.82984
-  tps: 1729.68007
+  dps: 1648.69427
+  tps: 1686.75339
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3290.301
-  tps: 3322.29344
+  dps: 3216.98605
+  tps: 3249.09696
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2416.35842
-  tps: 2957.799
+  dps: 2371.87073
+  tps: 2916.85088
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 843.96719
-  tps: 871.25851
+  dps: 830.04758
+  tps: 857.47361
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 956.4267
-  tps: 987.36958
+  dps: 939.50577
+  tps: 970.44864
  }
 }
 dps_results: {
@@ -316,22 +316,22 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2460.33053
-  tps: 3008.94535
+  dps: 2336.84363
+  tps: 2885.08746
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 860.14778
-  tps: 887.63954
+  dps: 831.83607
+  tps: 859.26559
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 959.16336
-  tps: 990.14783
+  dps: 942.16655
+  tps: 973.15101
  }
 }
 dps_results: {
@@ -358,106 +358,106 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2722.03995
-  tps: 2756.83955
+  dps: 2662.49289
+  tps: 2697.43551
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1700.08414
-  tps: 1735.86231
+  dps: 1636.39409
+  tps: 1672.32913
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
-  dps: 4603.81751
-  tps: 4642.86408
+  dps: 4467.44412
+  tps: 4506.59969
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1700.36844
-  tps: 1736.9658
+  dps: 1636.66995
+  tps: 1673.43329
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1821.15375
-  tps: 1858.97342
+  dps: 1756.57829
+  tps: 1794.57353
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
-  dps: 4689.53104
-  tps: 4728.05491
+  dps: 4535.30644
+  tps: 4574.33909
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 1988.31531
-  tps: 2026.21129
+  dps: 1918.05188
+  tps: 1956.13084
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 4559.01682
-  tps: 4596.97627
+  dps: 4416.26233
+  tps: 4455.17249
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1538.71107
-  tps: 1575.69119
+  dps: 1484.76799
+  tps: 1521.9238
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
-  dps: 1838.29441
-  tps: 1876.37952
+  dps: 1776.39984
+  tps: 1814.65058
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
-  dps: 2115.91618
-  tps: 2153.99378
+  dps: 2040.3499
+  tps: 2078.59377
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4677.8119
-  tps: 4715.85566
+  dps: 4539.2306
+  tps: 4577.6863
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 4104.96053
-  tps: 4719.95547
+  dps: 4000.33883
+  tps: 4615.99584
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1410.14782
-  tps: 1442.53704
+  dps: 1361.01085
+  tps: 1393.14579
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1522.65806
-  tps: 1561.47459
+  dps: 1479.5948
+  tps: 1518.43592
  }
 }
 dps_results: {
@@ -484,22 +484,22 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 4200.1392
-  tps: 4822.5046
+  dps: 4057.4348
+  tps: 4676.15211
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1414.98205
-  tps: 1447.53809
+  dps: 1357.98826
+  tps: 1390.29315
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1529.53106
-  tps: 1568.57312
+  dps: 1482.97618
+  tps: 1522.04282
  }
 }
 dps_results: {
@@ -526,7 +526,7 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3848.65749
-  tps: 3890.40868
+  dps: 3732.31738
+  tps: 3774.5257
  }
 }
diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
index fbc609d35c..a1186d39e0 100644
--- a/sim/paladin/retribution/TestRetribution.results
+++ b/sim/paladin/retribution/TestRetribution.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestRetribution-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 645.656
-  final_stats: 292.215
+  final_stats: 619.42623
+  final_stats: 268.36975
   final_stats: 635.72575
   final_stats: 187.22
   final_stats: 199.2375
@@ -160,26 +160,26 @@ character_stats_results: {
   final_stats: 122
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 6
   final_stats: 39.62657
   final_stats: 0
   final_stats: 0
-  final_stats: 2570.312
+  final_stats: 2468.85245
   final_stats: 9
-  final_stats: 47.48608
+  final_stats: 46.27951
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 4040.3
   final_stats: 0
   final_stats: 0
-  final_stats: 5426.43
+  final_stats: 5378.7395
   final_stats: 1029
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 15.48608
+  final_stats: 14.27951
   final_stats: 5
   final_stats: 0
   final_stats: 7858.2575
@@ -197,8 +197,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestRetribution-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 802.8955
-  final_stats: 399.74
+  final_stats: 776.66573
+  final_stats: 375.89475
   final_stats: 640.09
   final_stats: 172.04
   final_stats: 199.2375
@@ -209,26 +209,26 @@ character_stats_results: {
   final_stats: 86
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 4
   final_stats: 40.37307
   final_stats: 0
   final_stats: 0
-  final_stats: 2759.791
+  final_stats: 2658.33145
   final_stats: 7
-  final_stats: 52.92684
+  final_stats: 51.72027
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 3812.6
   final_stats: 0
   final_stats: 0
-  final_stats: 6098.48
+  final_stats: 6050.7895
   final_stats: 904
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 20.92684
+  final_stats: 19.72027
   final_stats: 5
   final_stats: 0
   final_stats: 7901.9
@@ -393,12 +393,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.63908
-  weights: 2.13154
+  weights: 2.59981
+  weights: 2.19847
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.40961
+  weights: 0.4066
   weights: 0
   weights: 0
   weights: 0
@@ -406,13 +406,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 8.20358
-  weights: 0.78553
+  weights: 5.84026
+  weights: 0.75964
   weights: 0
   weights: 0
-  weights: 0.94829
-  weights: 1.45683
-  weights: 26.95934
+  weights: 0.94008
+  weights: 1.02355
+  weights: 30.14154
   weights: 0
   weights: 0
   weights: 0
@@ -442,12 +442,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.99447
-  weights: 2.60673
+  weights: 2.9628
+  weights: 3.01582
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.51187
+  weights: 0.50627
   weights: 0
   weights: 0
   weights: 0
@@ -455,13 +455,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 11.5797
-  weights: 0.72035
+  weights: 10.58573
+  weights: 0.7147
   weights: 0
   weights: 0
-  weights: 1.05013
-  weights: 2.14054
-  weights: 40.87926
+  weights: 1.06369
+  weights: 1.51044
+  weights: 35.85223
   weights: 0
   weights: 0
   weights: 0
@@ -806,99 +806,99 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1764.76558
-  tps: 1804.38493
+  dps: 1645.57767
+  tps: 1683.85822
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
-  dps: 3772.8464
-  tps: 3822.0264
+  dps: 3637.69881
+  tps: 3687.06946
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1733.93628
-  tps: 1772.88668
+  dps: 1652.92462
+  tps: 1691.08669
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1859.89748
-  tps: 1900.00537
+  dps: 1750.43564
+  tps: 1789.69977
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
-  dps: 3815.672
-  tps: 3864.82193
+  dps: 3697.66281
+  tps: 3746.95402
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 2340.3397
-  tps: 2391.45019
+  dps: 2260.02181
+  tps: 2311.22899
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 3714.32765
-  tps: 3763.32216
+  dps: 3589.67711
+  tps: 3638.92181
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1609.20285
-  tps: 1648.15954
+  dps: 1546.75343
+  tps: 1585.08551
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
-  dps: 3319.85068
-  tps: 3368.89728
+  dps: 3204.82638
+  tps: 3254.20278
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
-  dps: 2452.10438
-  tps: 2494.99074
+  dps: 2367.27444
+  tps: 2410.28568
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3815.52713
-  tps: 3864.70383
+  dps: 3684.47657
+  tps: 3733.912
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 265.48144
-  tps: 466.0916
+  dps: 254.02447
+  tps: 453.9463
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 165.09644
-  tps: 175.12695
+  dps: 155.78993
+  tps: 165.78602
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 500.79832
-  tps: 518.75999
+  dps: 481.98792
+  tps: 499.94959
  }
 }
 dps_results: {
@@ -925,22 +925,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3336.17597
-  tps: 3900.88013
+  dps: 3224.47297
+  tps: 3789.57436
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1240.30805
-  tps: 1269.40038
+  dps: 1197.73028
+  tps: 1226.8818
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1425.63351
-  tps: 1458.99311
+  dps: 1374.55079
+  tps: 1407.91039
  }
 }
 dps_results: {
@@ -967,22 +967,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 197.74896
-  tps: 393.63912
+  dps: 191.12618
+  tps: 386.918
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 129.57946
-  tps: 139.37397
+  dps: 124.97801
+  tps: 134.7676
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 421.12567
-  tps: 438.5711
+  dps: 403.31612
+  tps: 420.73696
  }
 }
 dps_results: {
@@ -1009,15 +1009,15 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 504.14943
-  tps: 933.50637
+  dps: 485.42794
+  tps: 915.43785
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 328.96199
-  tps: 350.42984
+  dps: 305.40773
+  tps: 326.89839
  }
 }
 dps_results: {
@@ -1050,22 +1050,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 265.26765
-  tps: 466.17281
+  dps: 245.82502
+  tps: 446.82851
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 165.02155
-  tps: 175.0668
+  dps: 160.51052
+  tps: 170.5607
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 501.5703
-  tps: 519.53198
+  dps: 481.35337
+  tps: 499.31505
  }
 }
 dps_results: {
@@ -1092,22 +1092,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3397.55664
-  tps: 3964.41152
+  dps: 3253.38224
+  tps: 3818.25551
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1243.03365
-  tps: 1272.01737
+  dps: 1187.1667
+  tps: 1216.20435
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1426.3259
-  tps: 1459.75792
+  dps: 1373.22993
+  tps: 1406.66195
  }
 }
 dps_results: {
@@ -1134,22 +1134,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 198.01507
-  tps: 393.80689
+  dps: 189.23242
+  tps: 384.92592
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 129.80993
-  tps: 139.59952
+  dps: 122.76386
+  tps: 132.54853
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 427.60715
-  tps: 445.05257
+  dps: 406.64029
+  tps: 424.08571
  }
 }
 dps_results: {
@@ -1176,15 +1176,15 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 531.37893
-  tps: 963.1589
+  dps: 495.58866
+  tps: 927.06501
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 338.72811
-  tps: 360.33677
+  dps: 318.35908
+  tps: 339.95256
  }
 }
 dps_results: {
@@ -1217,106 +1217,106 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3065.42422
-  tps: 3114.10171
+  dps: 2980.71807
+  tps: 3029.73579
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 2484.4423
-  tps: 2541.65465
+  dps: 2385.1365
+  tps: 2442.00452
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
-  dps: 4610.87253
-  tps: 4667.07605
+  dps: 4461.25478
+  tps: 4517.73079
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 2482.45111
-  tps: 2540.2925
+  dps: 2384.23798
+  tps: 2441.68328
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 2638.62476
-  tps: 2698.01528
+  dps: 2545.65643
+  tps: 2604.7902
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
-  dps: 4705.5772
-  tps: 4761.87646
+  dps: 4549.03295
+  tps: 4605.46658
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 4033.52054
-  tps: 4096.95899
+  dps: 3895.11389
+  tps: 3958.60186
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 4560.41793
-  tps: 4616.33155
+  dps: 4418.00135
+  tps: 4474.2064
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1982.79704
-  tps: 2034.59381
+  dps: 1898.90294
+  tps: 1950.24336
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
-  dps: 3934.52498
-  tps: 3990.952
+  dps: 3799.93604
+  tps: 3856.46127
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
-  dps: 4256.91541
-  tps: 4314.61205
+  dps: 4117.86519
+  tps: 4175.88865
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4660.67139
-  tps: 4717.11307
+  dps: 4504.72482
+  tps: 4561.30997
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 1173.8849
-  tps: 1424.44839
+  dps: 1131.28577
+  tps: 1381.84926
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 802.57241
-  tps: 815.12025
+  dps: 763.01109
+  tps: 775.53434
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1198.3105
-  tps: 1218.48467
+  dps: 1139.37844
+  tps: 1159.40511
  }
 }
 dps_results: {
@@ -1343,22 +1343,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 64.87151
-  tps: 251.125
+  dps: 60.35792
+  tps: 246.80808
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 52.69992
-  tps: 62.01259
+  dps: 48.51008
+  tps: 57.83259
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 113.80849
-  tps: 129.70517
+  dps: 104.56181
+  tps: 120.38473
  }
 }
 dps_results: {
@@ -1384,22 +1384,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 1206.63175
-  tps: 1458.17857
+  dps: 1145.28774
+  tps: 1396.24457
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 824.76782
-  tps: 837.37467
+  dps: 764.78797
+  tps: 777.33581
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1199.84116
-  tps: 1220.03992
+  dps: 1146.26904
+  tps: 1166.36947
  }
 }
 dps_results: {
@@ -1426,22 +1426,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 63.30699
-  tps: 249.65882
+  dps: 61.46511
+  tps: 247.91527
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 51.15316
-  tps: 60.47076
+  dps: 49.63503
+  tps: 58.95754
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 116.32819
-  tps: 132.22486
+  dps: 107.051
+  tps: 122.87393
  }
 }
 dps_results: {
@@ -1467,7 +1467,7 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3782.58563
-  tps: 3837.98684
+  dps: 3668.22333
+  tps: 3723.76238
  }
 }
diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results
index 9c7429b011..309f3c82ac 100644
--- a/sim/paladin/retribution/TestShockadin.results
+++ b/sim/paladin/retribution/TestShockadin.results
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestShockadin-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 576.081
-  final_stats: 279.565
+  final_stats: 549.85123
+  final_stats: 255.71975
   final_stats: 647.36375
   final_stats: 435.5395
   final_stats: 205.87875
@@ -62,26 +62,26 @@ character_stats_results: {
   final_stats: 201
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 5
   final_stats: 38.77351
   final_stats: 0
   final_stats: 0
-  final_stats: 2212.162
+  final_stats: 2110.70245
   final_stats: 5
-  final_stats: 40.84599
+  final_stats: 39.63942
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 7765.0925
   final_stats: 0
   final_stats: 0
-  final_stats: 8513.13
+  final_stats: 8465.4395
   final_stats: 810
   final_stats: 0
   final_stats: 5
   final_stats: 51
-  final_stats: 14.84599
+  final_stats: 13.63942
   final_stats: 5
   final_stats: 0
   final_stats: 7974.6375
@@ -148,12 +148,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestShockadin-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 0.51264
-  weights: 0.50408
+  weights: 0.50863
+  weights: 1.87896
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.44786
+  weights: 1.43794
   weights: 0
   weights: 0
   weights: 0
@@ -161,13 +161,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.44674
-  weights: 9.09872
+  weights: 0.63405
+  weights: 12.2439
   weights: 0
   weights: 0
-  weights: 0.18421
-  weights: 7.44886
-  weights: 21.17216
+  weights: 0.18276
+  weights: 7.84947
+  weights: 24.03686
   weights: 0
   weights: 0
   weights: 0
@@ -302,78 +302,78 @@ dps_results: {
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1937.75204
-  tps: 1992.03688
+  dps: 1911.56205
+  tps: 1965.34447
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1945.62167
-  tps: 1998.88875
+  dps: 1948.81732
+  tps: 2003.07347
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1967.21865
-  tps: 2019.71208
+  dps: 1946.47865
+  tps: 1999.2065
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
-  dps: 3931.23716
-  tps: 4019.31504
+  dps: 3884.78035
+  tps: 3973.288
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 2896.19097
-  tps: 2983.02472
+  dps: 2851.39152
+  tps: 2937.6968
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 3648.67195
-  tps: 3736.1671
+  dps: 3586.27918
+  tps: 3672.49871
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1588.86569
-  tps: 1628.59778
+  dps: 1563.58906
+  tps: 1603.38837
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4001.70247
-  tps: 4086.75764
+  dps: 3956.06294
+  tps: 4041.54632
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3753.72737
-  tps: 4534.88227
+  dps: 3585.99922
+  tps: 4330.09925
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1632.78555
-  tps: 1672.18546
+  dps: 1606.83529
+  tps: 1645.34988
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2704.58106
-  tps: 2776.13017
+  dps: 2690.85133
+  tps: 2761.40756
  }
 }
 dps_results: {
@@ -400,22 +400,22 @@ dps_results: {
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3804.49005
-  tps: 4602.28495
+  dps: 3568.74557
+  tps: 4309.29894
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1657.60359
-  tps: 1697.50558
+  dps: 1607.04535
+  tps: 1645.63377
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5shockadin-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2706.69208
-  tps: 2777.85952
+  dps: 2698.58463
+  tps: 2769.86711
  }
 }
 dps_results: {
@@ -442,7 +442,7 @@ dps_results: {
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3773.97992
-  tps: 3859.29032
+  dps: 3734.08986
+  tps: 3819.06221
  }
 }
diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results
index 090e47c029..6a61fcdf42 100644
--- a/sim/priest/shadow/TestShadow.results
+++ b/sim/priest/shadow/TestShadow.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestShadow-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 174.9
-  final_stats: 181.5
+  final_stats: 155.1
+  final_stats: 169.4
   final_stats: 623.2655
   final_stats: 405.9
   final_stats: 221.1
@@ -165,7 +165,7 @@ character_stats_results: {
   final_stats: 38.61912
   final_stats: 0
   final_stats: 0
-  final_stats: 994.9
+  final_stats: 926.1
   final_stats: 0
   final_stats: 26
   final_stats: 0
@@ -174,7 +174,7 @@ character_stats_results: {
   final_stats: 7184.5
   final_stats: 0
   final_stats: 0
-  final_stats: 1012
+  final_stats: 987.8
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -197,8 +197,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestShadow-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 201.135
-  final_stats: 208.725
+  final_stats: 178.365
+  final_stats: 194.81
   final_stats: 726.2112
   final_stats: 492.085
   final_stats: 309.925
@@ -214,7 +214,7 @@ character_stats_results: {
   final_stats: 39.06703
   final_stats: 0
   final_stats: 0
-  final_stats: 1021.135
+  final_stats: 949.365
   final_stats: 0
   final_stats: 25
   final_stats: 0
@@ -223,7 +223,7 @@ character_stats_results: {
   final_stats: 8477.275
   final_stats: 0
   final_stats: 0
-  final_stats: 1146.45
+  final_stats: 1118.62
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -246,8 +246,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestShadow-Phase6-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 196.075
-  final_stats: 203.665
+  final_stats: 173.305
+  final_stats: 189.75
   final_stats: 731.88473
   final_stats: 452.87
   final_stats: 249.205
@@ -263,7 +263,7 @@ character_stats_results: {
   final_stats: 43.40822
   final_stats: 0
   final_stats: 0
-  final_stats: 1016.075
+  final_stats: 944.305
   final_stats: 1
   final_stats: 29
   final_stats: 0
@@ -272,7 +272,7 @@ character_stats_results: {
   final_stats: 7889.05
   final_stats: 0
   final_stats: 0
-  final_stats: 1187.33
+  final_stats: 1159.5
   final_stats: 740
   final_stats: 0
   final_stats: 5
@@ -996,22 +996,22 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4019.75948
-  tps: 4307.21034
+  dps: 4021.34049
+  tps: 4314.77912
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
   dps: 3461.59699
-  tps: 3209.95325
+  tps: 3210.1068
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3377.51251
-  tps: 2989.12291
+  tps: 2989.26928
  }
 }
 dps_results: {
@@ -1165,21 +1165,21 @@ dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
   dps: 4207.1356
-  tps: 4458.35841
+  tps: 4464.67435
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
   dps: 3860.01576
-  tps: 3568.59986
+  tps: 3568.70101
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3690.67462
-  tps: 3229.29369
+  tps: 3229.43078
  }
 }
 dps_results: {
@@ -1207,21 +1207,21 @@ dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
   dps: 5068.05741
-  tps: 5163.72723
+  tps: 5167.42083
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
   dps: 3965.78061
-  tps: 3668.64101
+  tps: 3668.64815
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t2-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3783.17843
-  tps: 3322.8173
+  tps: 3322.85071
  }
 }
 dps_results: {
@@ -1417,21 +1417,21 @@ dps_results: {
  key: "TestShadow-Phase6-Lvl60-Settings-NightElf-phase_6-Basic-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
   dps: 5517.40831
-  tps: 5694.03787
+  tps: 5695.36565
  }
 }
 dps_results: {
  key: "TestShadow-Phase6-Lvl60-Settings-NightElf-phase_6-Basic-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
   dps: 5517.40831
-  tps: 5146.59634
+  tps: 5146.66273
  }
 }
 dps_results: {
  key: "TestShadow-Phase6-Lvl60-Settings-NightElf-phase_6-Basic-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
   dps: 5293.31719
-  tps: 4728.64701
+  tps: 4728.73226
  }
 }
 dps_results: {
diff --git a/sim/rogue/backstab.go b/sim/rogue/backstab.go
index fee3dcf1ac..c036c14fa2 100644
--- a/sim/rogue/backstab.go
+++ b/sim/rogue/backstab.go
@@ -12,14 +12,14 @@ func (rogue *Rogue) registerBackstabSpell() {
 		25: 32,
 		40: 60,
 		50: 90,
-		60: core.TernaryFloat64(core.IncludeAQ, 150, 140),
+		60: core.TernaryFloat64(rogue.Env.UseAQSpellRanks, 150, 140),
 	}[rogue.Level]
 
 	spellID := map[int32]int32{
 		25: 2590,
 		40: 8721,
 		50: 11279,
-		60: core.TernaryInt32(core.IncludeAQ, 25300, 11281),
+		60: core.TernaryInt32(rogue.Env.UseAQSpellRanks, 25300, 11281),
 	}[rogue.Level]
 
 	// waylay := rogue.HasRune(proto.RogueRune_RuneWaylay)
diff --git a/sim/rogue/dps_rogue/TestAssassination.results b/sim/rogue/dps_rogue/TestAssassination.results
index 142481eac7..02de7d09b4 100644
--- a/sim/rogue/dps_rogue/TestAssassination.results
+++ b/sim/rogue/dps_rogue/TestAssassination.results
@@ -99,8 +99,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestAssassination-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 459.195
-  final_stats: 714.725
+  final_stats: 435.34975
+  final_stats: 690.87975
   final_stats: 615.35925
   final_stats: 127.765
   final_stats: 166.03125
@@ -111,26 +111,26 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 13
   final_stats: 27
   final_stats: 0
   final_stats: 0
-  final_stats: 2351.92
+  final_stats: 2255.2295
   final_stats: 15
-  final_stats: 57.65801
+  final_stats: 56.83535
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 3109.45
-  final_stats: 1702.725
+  final_stats: 3061.7595
+  final_stats: 1678.87975
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 52.31603
+  final_stats: 50.6707
   final_stats: 5
   final_stats: 0
   final_stats: 7796.5925
@@ -246,8 +246,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestAssassination-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 0.34691
-  weights: 0.55775
+  weights: 0.8913
+  weights: 1.30439
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.27424
-  weights: 13.16868
-  weights: 2.57765
+  weights: 0.70459
+  weights: 13.41775
+  weights: 7.53506
   weights: 0
   weights: 0
   weights: 0
@@ -505,112 +505,112 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
  value: {
-  dps: 853.94128
-  tps: 606.29831
+  dps: 1362.94145
+  tps: 967.68843
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-AllItems-DarkmantleArmor"
  value: {
-  dps: 562.93903
-  tps: 399.68671
+  dps: 1137.48944
+  tps: 807.6175
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 911.93624
-  tps: 647.47473
+  dps: 2708.2972
+  tps: 1922.89101
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 192.30395
-  tps: 136.53581
+  dps: 1919.98997
+  tps: 1363.19288
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 175.94258
-  tps: 124.91923
+  dps: 1881.18542
+  tps: 1335.64165
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 373.67409
-  tps: 265.30861
+  dps: 2231.90774
+  tps: 1584.65449
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 87.13977
-  tps: 61.86924
+  dps: 925.14626
+  tps: 656.85384
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 77.85727
-  tps: 55.27866
+  dps: 902.10801
+  tps: 640.49669
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 165.84464
-  tps: 117.7497
+  dps: 1098.40258
+  tps: 779.86583
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 197.34631
-  tps: 140.11588
+  dps: 1950.74172
+  tps: 1385.02662
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 180.98494
-  tps: 128.4993
+  dps: 1911.93718
+  tps: 1357.4754
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 394.31
-  tps: 279.9601
+  dps: 2289.35053
+  tps: 1625.43888
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 89.10867
-  tps: 63.26716
+  dps: 930.76679
+  tps: 660.84442
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 79.82617
-  tps: 56.67658
+  dps: 907.57854
+  tps: 644.38076
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 173.7295
-  tps: 123.34795
+  dps: 1135.24004
+  tps: 806.02043
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 714.46481
-  tps: 507.27001
+  dps: 2338.85795
+  tps: 1660.58914
  }
 }
diff --git a/sim/rogue/dps_rogue/TestCombat.results b/sim/rogue/dps_rogue/TestCombat.results
index b121ddf36a..73bad360cd 100644
--- a/sim/rogue/dps_rogue/TestCombat.results
+++ b/sim/rogue/dps_rogue/TestCombat.results
@@ -99,8 +99,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestCombat-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 442.75
-  final_stats: 786.83
+  final_stats: 418.90475
+  final_stats: 762.98475
   final_stats: 609.54025
   final_stats: 127.765
   final_stats: 166.03125
@@ -111,26 +111,26 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 15
   final_stats: 27
   final_stats: 0
   final_stats: 0
-  final_stats: 2335.58
+  final_stats: 2238.8895
   final_stats: 20
-  final_stats: 55.14564
+  final_stats: 54.32297
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 3306.66
-  final_stats: 1702.83
+  final_stats: 3258.9695
+  final_stats: 1678.98475
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 57.29127
+  final_stats: 55.64595
   final_stats: 5
   final_stats: 0
   final_stats: 7738.4025
@@ -246,8 +246,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestCombat-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.52138
-  weights: 2.83182
+  weights: 1.51583
+  weights: 2.4445
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.20267
-  weights: 17.48268
-  weights: 18.9029
+  weights: 1.19829
+  weights: 16.75388
+  weights: 23.00903
   weights: 0
   weights: 0
   weights: 0
@@ -505,43 +505,43 @@ dps_results: {
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
  value: {
-  dps: 1135.10326
-  tps: 805.92331
+  dps: 1095.40143
+  tps: 777.73502
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-AllItems-DarkmantleArmor"
  value: {
-  dps: 962.0195
-  tps: 683.03384
+  dps: 930.10434
+  tps: 660.37408
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4159.99249
-  tps: 2953.59467
+  dps: 4028.1221
+  tps: 2859.96669
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2665.72406
-  tps: 1892.66408
+  dps: 2582.33388
+  tps: 1833.45705
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2408.0726
-  tps: 1709.73155
+  dps: 2331.20836
+  tps: 1655.15794
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2399.73651
-  tps: 1703.81292
+  dps: 2308.52858
+  tps: 1639.05529
  }
 }
 dps_results: {
@@ -568,22 +568,22 @@ dps_results: {
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2784.83545
-  tps: 1977.23317
+  dps: 2692.72321
+  tps: 1911.83348
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2515.90033
-  tps: 1786.28923
+  dps: 2421.92341
+  tps: 1719.56562
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2522.74915
-  tps: 1791.1519
+  dps: 2456.15934
+  tps: 1743.87313
  }
 }
 dps_results: {
@@ -610,7 +610,7 @@ dps_results: {
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3522.55134
-  tps: 2501.01145
+  dps: 3409.69414
+  tps: 2420.88284
  }
 }
diff --git a/sim/rogue/poisons.go b/sim/rogue/poisons.go
index 8024f10312..2c48000a1b 100644
--- a/sim/rogue/poisons.go
+++ b/sim/rogue/poisons.go
@@ -346,13 +346,13 @@ func (rogue *Rogue) registerDeadlyPoisonSpell() {
 		25: 9,
 		40: 13,
 		50: 20,
-		60: 34, //updated to Rank 5
+		60: core.TernaryFloat64(rogue.Env.UseAQSpellRanks, 34, 27),
 	}[rogue.Level]
 	spellID := map[int32]int32{
 		25: 2823,
 		40: 2824,
 		50: 11355,
-		60: 25351,
+		60: core.TernaryInt32(rogue.Env.UseAQSpellRanks, 25351, 8985),
 	}[rogue.Level]
 
 	hasDeadlyBrew := rogue.HasRune(proto.RogueRune_RuneDeadlyBrew)
diff --git a/sim/rogue/tank_rogue/TestTank.results b/sim/rogue/tank_rogue/TestTank.results
index e8d3c76df3..2d7eaf2d23 100644
--- a/sim/rogue/tank_rogue/TestTank.results
+++ b/sim/rogue/tank_rogue/TestTank.results
@@ -1,8 +1,8 @@
 character_stats_results: {
  key: "TestTank-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 371.91
-  final_stats: 796.95
+  final_stats: 348.06475
+  final_stats: 773.10475
   final_stats: 711.37275
   final_stats: 127.765
   final_stats: 166.03125
@@ -13,26 +13,26 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 49.6
+  final_stats: 46
   final_stats: 15
   final_stats: 23
   final_stats: 0
   final_stats: 0
-  final_stats: 2246.86
+  final_stats: 2150.1695
   final_stats: 20
-  final_stats: 51.49478
+  final_stats: 50.67211
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 3317.9
-  final_stats: 1684.95
+  final_stats: 3270.2095
+  final_stats: 1661.10475
   final_stats: 100
   final_stats: 9
   final_stats: 0
-  final_stats: 61.98955
+  final_stats: 60.34423
   final_stats: 14
   final_stats: 0
   final_stats: 8756.7275
@@ -50,8 +50,8 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestTank-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 0.62325
-  weights: 0.86826
+  weights: 0.62404
+  weights: 0.91234
   weights: 0
   weights: 0
   weights: 0
@@ -67,9 +67,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.49269
-  weights: 14.90378
-  weights: 1.68185
+  weights: 0.49331
+  weights: 13.63519
+  weights: 1.44622
   weights: 0
   weights: 0
   weights: 0
@@ -99,43 +99,43 @@ stat_weights_results: {
 dps_results: {
  key: "TestTank-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
  value: {
-  dps: 1603.4916
-  tps: 1233.15925
+  dps: 1544.42869
+  tps: 1186.22346
  }
 }
 dps_results: {
  key: "TestTank-Phase5-Lvl60-AllItems-DarkmantleArmor"
  value: {
-  dps: 643.69377
-  tps: 560.41906
+  dps: 622.61888
+  tps: 541.50838
  }
 }
 dps_results: {
  key: "TestTank-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 1647.50212
-  tps: 3926.80039
+  dps: 1595.76383
+  tps: 3800.21707
  }
 }
 dps_results: {
  key: "TestTank-Phase5-Lvl60-Settings-Human-p5_saber-Basic-P5_Saber-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1448.58666
-  tps: 5721.12437
+  dps: 1412.26244
+  tps: 5551.69751
  }
 }
 dps_results: {
  key: "TestTank-Phase5-Lvl60-Settings-Human-p5_saber-Basic-P5_Saber-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 982.42323
-  tps: 2665.54198
+  dps: 957.58798
+  tps: 2583.40596
  }
 }
 dps_results: {
  key: "TestTank-Phase5-Lvl60-Settings-Human-p5_saber-Basic-P5_Saber-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1050.48247
-  tps: 2779.01488
+  dps: 1008.48489
+  tps: 2685.21376
  }
 }
 dps_results: {
@@ -162,22 +162,22 @@ dps_results: {
 dps_results: {
  key: "TestTank-Phase5-Lvl60-Settings-Orc-p5_saber-Basic-P5_Saber-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1468.18567
-  tps: 5787.68145
+  dps: 1425.72081
+  tps: 5607.55846
  }
 }
 dps_results: {
  key: "TestTank-Phase5-Lvl60-Settings-Orc-p5_saber-Basic-P5_Saber-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 993.77921
-  tps: 2707.23342
+  dps: 963.45655
+  tps: 2603.73752
  }
 }
 dps_results: {
  key: "TestTank-Phase5-Lvl60-Settings-Orc-p5_saber-Basic-P5_Saber-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1128.49402
-  tps: 2932.91894
+  dps: 1092.88133
+  tps: 2862.00672
  }
 }
 dps_results: {
@@ -204,7 +204,7 @@ dps_results: {
 dps_results: {
  key: "TestTank-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1670.04395
-  tps: 3975.9748
+  dps: 1611.14286
+  tps: 3837.15202
  }
 }
diff --git a/sim/shaman/air_totems.go b/sim/shaman/air_totems.go
index 3fe8ea07fb..7a8dadf651 100644
--- a/sim/shaman/air_totems.go
+++ b/sim/shaman/air_totems.go
@@ -50,16 +50,13 @@ func (shaman *Shaman) newWindfuryTotemSpellConfig(rank int) core.SpellConfig {
 	return spell
 }
 
-const GraceOfAirTotemRanks = 3
-
-var GraceOfAirTotemSpellId = [GraceOfAirTotemRanks + 1]int32{0, 8835, 10627, 25359}
-var GraceOfAirTotemManaCost = [GraceOfAirTotemRanks + 1]float64{0, 155, 250, 310}
-var GraceOfAirTotemLevel = [GraceOfAirTotemRanks + 1]int{0, 42, 56, 60}
+var GraceOfAirTotemManaCost = [core.GraceOfAirTotemRanks + 1]float64{0, 155, 250, 310}
+var GraceOfAirTotemLevel = [core.GraceOfAirTotemRanks + 1]int{0, 42, 56, 60}
 
 func (shaman *Shaman) registerGraceOfAirTotemSpell() {
-	shaman.GraceOfAirTotem = make([]*core.Spell, GraceOfAirTotemRanks+1)
+	shaman.GraceOfAirTotem = make([]*core.Spell, core.GraceOfAirTotemRanks+1)
 
-	for rank := 1; rank <= GraceOfAirTotemRanks; rank++ {
+	for rank := 1; rank <= core.GraceOfAirTotemRanks; rank++ {
 		config := shaman.newGraceOfAirTotemSpellConfig(rank)
 
 		if config.RequiredLevel <= int(shaman.Level) {
@@ -74,7 +71,7 @@ func (shaman *Shaman) registerGraceOfAirTotemSpell() {
 }
 
 func (shaman *Shaman) newGraceOfAirTotemSpellConfig(rank int) core.SpellConfig {
-	spellId := GraceOfAirTotemSpellId[rank]
+	spellId := core.GraceOfAirTotemSpellId[rank]
 	manaCost := GraceOfAirTotemManaCost[rank]
 	level := GraceOfAirTotemLevel[rank]
 
diff --git a/sim/shaman/earth_totems.go b/sim/shaman/earth_totems.go
index 9ddd1be9a2..ba2ce41894 100644
--- a/sim/shaman/earth_totems.go
+++ b/sim/shaman/earth_totems.go
@@ -7,16 +7,13 @@ import (
 	"github.com/wowsims/sod/sim/core/proto"
 )
 
-const StrengthOfEarthTotemRanks = 5
-
-var StrengthOfEarthTotemSpellId = [StrengthOfEarthTotemRanks + 1]int32{0, 8075, 8160, 8161, 10442, 25361}
-var StrengthOfEarthTotemManaCost = [StrengthOfEarthTotemRanks + 1]float64{0, 25, 65, 125, 225, 275}
-var StrengthOfEarthTotemLevel = [StrengthOfEarthTotemRanks + 1]int{0, 10, 24, 38, 52, 60}
+var StrengthOfEarthTotemManaCost = [core.StrengthOfEarthTotemRanks + 1]float64{0, 25, 65, 125, 225, 275}
+var StrengthOfEarthTotemLevel = [core.StrengthOfEarthTotemRanks + 1]int{0, 10, 24, 38, 52, 60}
 
 func (shaman *Shaman) registerStrengthOfEarthTotemSpell() {
-	shaman.StrengthOfEarthTotem = make([]*core.Spell, StrengthOfEarthTotemRanks+1)
+	shaman.StrengthOfEarthTotem = make([]*core.Spell, core.StrengthOfEarthTotemRanks+1)
 
-	for rank := 1; rank <= StrengthOfEarthTotemRanks; rank++ {
+	for rank := 1; rank <= core.StrengthOfEarthTotemRanks; rank++ {
 		config := shaman.newStrengthOfEarthTotemSpellConfig(rank)
 
 		if config.RequiredLevel <= int(shaman.Level) {
@@ -31,7 +28,7 @@ func (shaman *Shaman) registerStrengthOfEarthTotemSpell() {
 }
 
 func (shaman *Shaman) newStrengthOfEarthTotemSpellConfig(rank int) core.SpellConfig {
-	spellId := StrengthOfEarthTotemSpellId[rank]
+	spellId := core.StrengthOfEarthTotemSpellId[rank]
 	manaCost := StrengthOfEarthTotemManaCost[rank]
 	level := StrengthOfEarthTotemLevel[rank]
 
diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index 2944feec61..8d0b5a977a 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestElemental-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 229.9
-  final_stats: 198
+  final_stats: 210.1
+  final_stats: 185.9
   final_stats: 495.88
   final_stats: 366.3
   final_stats: 193.6
@@ -165,21 +165,21 @@ character_stats_results: {
   final_stats: 35.49047
   final_stats: 0
   final_stats: 0
-  final_stats: 1389.8
+  final_stats: 1301.2
   final_stats: 8
-  final_stats: 30.7584
+  final_stats: 30.14372
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 6734.5
   final_stats: 0
   final_stats: 0
-  final_stats: 5511
+  final_stats: 5486.8
   final_stats: 740
   final_stats: 0
   final_stats: 5
   final_stats: 45
-  final_stats: 11.7584
+  final_stats: 11.14372
   final_stats: 5
   final_stats: 0
   final_stats: 6501.8
@@ -197,8 +197,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestElemental-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 264.385
-  final_stats: 227.7
+  final_stats: 241.615
+  final_stats: 213.785
   final_stats: 640.09
   final_stats: 478.17
   final_stats: 246.675
@@ -214,21 +214,21 @@ character_stats_results: {
   final_stats: 40.38107
   final_stats: 0
   final_stats: 0
-  final_stats: 1458.77
+  final_stats: 1364.23
   final_stats: 9
-  final_stats: 34.26716
+  final_stats: 33.56028
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 8412.55
   final_stats: 0
   final_stats: 0
-  final_stats: 6344.4
+  final_stats: 6316.57
   final_stats: 740
   final_stats: 0
   final_stats: 5
   final_stats: 55
-  final_stats: 13.26716
+  final_stats: 12.56028
   final_stats: 5
   final_stats: 0
   final_stats: 7943.9
@@ -246,8 +246,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestElemental-Phase6-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 259.325
-  final_stats: 222.64
+  final_stats: 236.555
+  final_stats: 208.725
   final_stats: 612.44975
   final_stats: 542.685
   final_stats: 217.58
@@ -263,21 +263,21 @@ character_stats_results: {
   final_stats: 45.47138
   final_stats: 0
   final_stats: 0
-  final_stats: 1448.65
+  final_stats: 1354.11
   final_stats: 10
-  final_stats: 38.01011
+  final_stats: 37.30323
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 9380.275
   final_stats: 0
   final_stats: 0
-  final_stats: 6623.28
+  final_stats: 6595.45
   final_stats: 740
   final_stats: 0
   final_stats: 5
   final_stats: 55
-  final_stats: 13.01011
+  final_stats: 12.30323
   final_stats: 5
   final_stats: 0
   final_stats: 7667.4975
@@ -445,18 +445,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.17515
+  weights: 2.53818
   weights: 0
-  weights: 1.731
+  weights: 1.46966
   weights: 0
-  weights: 0.54471
+  weights: 0.25824
   weights: 0
   weights: 0
-  weights: 1.1863
+  weights: 1.21143
   weights: 0
   weights: 0
-  weights: 33.64668
-  weights: 17.59018
+  weights: 22.25678
+  weights: 20.06059
   weights: 0
   weights: 0
   weights: 0
@@ -494,18 +494,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 4.53358
+  weights: 4.33875
   weights: 0
-  weights: 2.13579
+  weights: 1.95448
   weights: 0
-  weights: 0.53095
+  weights: 0.23031
   weights: 0
   weights: 0
-  weights: 1.60484
+  weights: 1.72417
   weights: 0
   weights: 0
   weights: 0
-  weights: 25.56608
+  weights: 31.6569
   weights: 0
   weights: 0
   weights: 0
@@ -543,18 +543,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 4.74169
+  weights: 4.82156
   weights: 0
-  weights: 2.21583
+  weights: 2.05561
   weights: 0
-  weights: 0.71586
+  weights: 0.32764
   weights: 0
   weights: 0
-  weights: 1.49996
+  weights: 1.72797
   weights: 0
   weights: 0
   weights: 0
-  weights: 35.52025
+  weights: 42.35313
   weights: 0
   weights: 0
   weights: 0
@@ -883,483 +883,483 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1424.0717
-  tps: 1489.24805
+  dps: 1410.77862
+  tps: 1483.62781
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1422.86192
-  tps: 1488.04662
+  dps: 1409.86253
+  tps: 1483.16441
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1550.47396
-  tps: 1613.20902
+  dps: 1541.42585
+  tps: 1614.84937
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1503.5338
-  tps: 1567.88733
+  dps: 1491.92631
+  tps: 1564.67141
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1422.52239
-  tps: 1488.01242
+  dps: 1408.9631
+  tps: 1482.41587
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1422.74492
-  tps: 1488.23495
+  dps: 1409.10281
+  tps: 1482.55557
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 2570.31193
-  tps: 2605.90389
+  dps: 2128.68722
+  tps: 2166.15957
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 2700.25892
-  tps: 2736.62976
+  dps: 2241.37214
+  tps: 2274.86592
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1318.22964
-  tps: 1309.72213
+  dps: 1272.32527
+  tps: 1260.98744
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3544.18583
-  tps: 2156.18689
+  dps: 2929.13923
+  tps: 1755.06597
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 6404.09238
-  tps: 4315.25198
+  dps: 5781.47358
+  tps: 3875.99983
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3432.17279
-  tps: 2086.78976
+  dps: 2834.01307
+  tps: 1691.62074
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3495.20819
-  tps: 2138.43997
+  dps: 2901.4432
+  tps: 1745.33917
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2565.76147
-  tps: 2002.95845
+  dps: 2199.25935
+  tps: 1746.04998
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1652.41692
-  tps: 1022.9578
+  dps: 1278.02691
+  tps: 785.28787
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1725.27604
-  tps: 1076.84021
+  dps: 1345.36717
+  tps: 826.44237
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 6404.8852
-  tps: 4295.00405
+  dps: 5817.6172
+  tps: 3898.42392
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3495.65084
-  tps: 2133.06941
+  dps: 2862.59462
+  tps: 1710.87002
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3567.71887
-  tps: 2184.78495
+  dps: 2945.89897
+  tps: 1771.30136
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2502.73887
-  tps: 1970.09862
+  dps: 2137.12071
+  tps: 1689.57154
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1672.29657
-  tps: 1040.74809
+  dps: 1291.88007
+  tps: 790.42645
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1760.27415
-  tps: 1102.07985
+  dps: 1383.18555
+  tps: 844.36903
  }
 }
 dps_results: {
  key: "TestElemental-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3511.70992
-  tps: 2133.00355
+  dps: 2905.8277
+  tps: 1743.19915
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1496.32472
-  tps: 1523.83518
+  dps: 1466.67852
+  tps: 1506.789
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1495.57444
-  tps: 1522.89694
+  dps: 1466.68767
+  tps: 1506.81944
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1622.20155
-  tps: 1648.80899
+  dps: 1609.08798
+  tps: 1645.08008
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1578.33259
-  tps: 1604.632
+  dps: 1551.00177
+  tps: 1590.62424
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1493.71809
-  tps: 1521.06091
+  dps: 1465.40395
+  tps: 1505.55981
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1494.02323
-  tps: 1521.36604
+  dps: 1465.59497
+  tps: 1505.75083
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 2840.1574
-  tps: 2838.05039
+  dps: 2456.99195
+  tps: 2464.3019
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 2965.12843
-  tps: 2963.20921
+  dps: 2587.94598
+  tps: 2595.45195
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1334.91629
-  tps: 1318.74953
+  dps: 1268.57113
+  tps: 1245.13427
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4734.52603
-  tps: 2852.40854
+  dps: 4251.34805
+  tps: 2516.26184
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 8897.1409
-  tps: 4427.80971
+  dps: 6165.27726
+  tps: 2585.97377
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 4577.6635
-  tps: 2756.12378
+  dps: 4158.00419
+  tps: 2466.73797
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4945.37218
-  tps: 3052.14925
+  dps: 4516.51461
+  tps: 2738.59466
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 4558.85221
-  tps: 2346.70466
+  dps: 2873.38145
+  tps: 1375.5933
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 2033.36277
-  tps: 1233.37209
+  dps: 1744.33179
+  tps: 1043.30382
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Orc-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2221.37926
-  tps: 1388.88598
+  dps: 1931.37921
+  tps: 1177.4876
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 8934.84612
-  tps: 4448.11754
+  dps: 6184.6514
+  tps: 2604.77689
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 4607.19235
-  tps: 2766.08304
+  dps: 4175.12659
+  tps: 2484.89168
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4972.30814
-  tps: 3070.04662
+  dps: 4559.93906
+  tps: 2749.55021
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 4556.35493
-  tps: 2345.80472
+  dps: 2895.4305
+  tps: 1386.46222
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 2051.30392
-  tps: 1242.0121
+  dps: 1755.73137
+  tps: 1051.16205
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-Settings-Troll-phase_5-Adaptive-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2228.23002
-  tps: 1386.6852
+  dps: 1995.27938
+  tps: 1216.86218
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 4676.25284
-  tps: 2830.015
+  dps: 4200.89634
+  tps: 2488.92219
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1579.44694
-  tps: 1651.86218
+  dps: 1600.69557
+  tps: 1689.62652
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1578.90785
-  tps: 1651.10981
+  dps: 1600.30634
+  tps: 1689.22524
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1715.09279
-  tps: 1782.51854
+  dps: 1729.97655
+  tps: 1820.04812
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1666.52587
-  tps: 1737.14597
+  dps: 1692.29524
+  tps: 1780.67762
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1577.532
-  tps: 1649.26436
+  dps: 1598.90329
+  tps: 1687.62113
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1577.71989
-  tps: 1649.45225
+  dps: 1598.99306
+  tps: 1687.7109
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 3472.44779
-  tps: 3503.31222
+  dps: 2999.95436
+  tps: 3044.69571
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 3630.32822
-  tps: 3662.16136
+  dps: 3156.11777
+  tps: 3200.81895
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1394.09718
-  tps: 1384.8096
+  dps: 1386.43529
+  tps: 1369.36386
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 5422.92788
-  tps: 3227.26102
+  dps: 4863.67157
+  tps: 2865.35342
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 10980.76571
-  tps: 6828.88056
+  dps: 8194.03099
+  tps: 5114.41057
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 5328.53284
-  tps: 3182.36023
+  dps: 4753.54963
+  tps: 2820.74235
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 5566.87558
-  tps: 3385.99456
+  dps: 4873.67251
+  tps: 2914.75625
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 4241.04662
-  tps: 2933.42923
+  dps: 3581.46983
+  tps: 2704.6999
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 2339.73149
-  tps: 1423.36217
+  dps: 1941.08263
+  tps: 1168.83109
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Orc-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2515.21964
-  tps: 1559.5038
+  dps: 2029.91758
+  tps: 1237.54664
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 10995.26957
-  tps: 6850.82954
+  dps: 8212.19897
+  tps: 5120.08505
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 5336.07375
-  tps: 3180.63788
+  dps: 4790.84866
+  tps: 2832.34811
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 5603.54225
-  tps: 3385.68601
+  dps: 5134.79118
+  tps: 3094.30022
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 4141.43806
-  tps: 2893.5209
+  dps: 3629.58842
+  tps: 2758.44874
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 2336.50693
-  tps: 1421.52303
+  dps: 1957.09318
+  tps: 1179.50471
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-Settings-Troll-phase_6-Adaptive-phase_6-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2474.07185
-  tps: 1528.2939
+  dps: 2130.94428
+  tps: 1322.94121
  }
 }
 dps_results: {
  key: "TestElemental-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5346.4812
-  tps: 3176.98561
+  dps: 4813.07316
+  tps: 2838.38606
  }
 }
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index 6493448380..f7bf1a7008 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestEnhancement-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 449.9
-  final_stats: 257.4
+  final_stats: 430.1
+  final_stats: 245.3
   final_stats: 476.905
   final_stats: 253
   final_stats: 193.6
@@ -165,21 +165,21 @@ character_stats_results: {
   final_stats: 36.5757
   final_stats: 0
   final_stats: 0
-  final_stats: 2033.8
+  final_stats: 1945.2
   final_stats: 14
-  final_stats: 43.77592
+  final_stats: 43.16124
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 5286.75
   final_stats: 0
   final_stats: 0
-  final_stats: 3042.8
+  final_stats: 3018.6
   final_stats: 944
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 14.77592
+  final_stats: 14.16124
   final_stats: 5
   final_stats: 0
   final_stats: 6312.05
@@ -197,8 +197,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestEnhancement-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 581.9
-  final_stats: 321.31
+  final_stats: 559.13
+  final_stats: 307.395
   final_stats: 651.728
   final_stats: 318.78
   final_stats: 227.7
@@ -214,21 +214,21 @@ character_stats_results: {
   final_stats: 37.68738
   final_stats: 0
   final_stats: 0
-  final_stats: 2413.8
+  final_stats: 2319.26
   final_stats: 19
-  final_stats: 47.02255
+  final_stats: 46.31567
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 6322.785
   final_stats: 0
   final_stats: 0
-  final_stats: 3605.62
+  final_stats: 3577.79
   final_stats: 1060
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 18.02255
+  final_stats: 17.31567
   final_stats: 5
   final_stats: 0
   final_stats: 8060.28
@@ -246,8 +246,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestEnhancement-Phase6-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 755.205
-  final_stats: 371.91
+  final_stats: 732.435
+  final_stats: 357.995
   final_stats: 656.09225
   final_stats: 371.91
   final_stats: 222.64
@@ -263,21 +263,21 @@ character_stats_results: {
   final_stats: 38.58528
   final_stats: 0
   final_stats: 0
-  final_stats: 2578.41
+  final_stats: 2483.87
   final_stats: 13
-  final_stats: 49.59303
+  final_stats: 48.88615
   final_stats: 0
   final_stats: 0
   final_stats: 3
   final_stats: 7159.5825
   final_stats: 0
   final_stats: 0
-  final_stats: 4088.82
+  final_stats: 4060.99
   final_stats: 878
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 20.59303
+  final_stats: 19.88615
   final_stats: 5
   final_stats: 0
   final_stats: 8103.9225
@@ -442,12 +442,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.07186
-  weights: 0.43645
+  weights: 2.06612
+  weights: 0.79773
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.7593
+  weights: 0.74144
   weights: 0
   weights: 0
   weights: 0
@@ -459,9 +459,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.94176
-  weights: 26.47467
-  weights: 10.2085
+  weights: 0.93915
+  weights: 25.85113
+  weights: 11.56876
   weights: 0
   weights: 0
   weights: 0
@@ -491,12 +491,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.53261
-  weights: 1.31136
+  weights: 2.51262
+  weights: 0.37345
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.83964
+  weights: 0.82405
   weights: 0
   weights: 0
   weights: 0
@@ -508,9 +508,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.00103
-  weights: 29.31526
-  weights: 10.97444
+  weights: 0.99313
+  weights: 29.96914
+  weights: 11.17546
   weights: 0
   weights: 0
   weights: 0
@@ -540,12 +540,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Phase6-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.09611
-  weights: 2.272
+  weights: 3.06973
+  weights: 2.23363
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.81547
+  weights: 0.79809
   weights: 0
   weights: 0
   weights: 0
@@ -557,9 +557,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.22376
-  weights: 31.0124
-  weights: 28.59775
+  weights: 1.21333
+  weights: 32.38214
+  weights: 27.37243
   weights: 0
   weights: 0
   weights: 0
@@ -1135,1239 +1135,1239 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1879.53622
-  tps: 1904.4132
+  dps: 1844.35306
+  tps: 1966.47389
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1948.152
-  tps: 1971.76041
+  dps: 1913.30129
+  tps: 2033.98555
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1985.54568
-  tps: 2011.23408
+  dps: 1964.27902
+  tps: 2088.59911
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1924.38712
-  tps: 1949.4715
+  dps: 1888.79915
+  tps: 2014.55984
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1878.36658
-  tps: 1903.48059
+  dps: 1843.88208
+  tps: 1965.7471
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1925.18724
-  tps: 1949.388
+  dps: 1891.05528
+  tps: 2012.01647
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 2862.07187
-  tps: 2923.25074
+  dps: 2750.93848
+  tps: 2955.22551
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 2808.42264
-  tps: 2872.18037
+  dps: 2716.75155
+  tps: 2927.71671
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1552.94784
-  tps: 1585.66459
+  dps: 1507.14821
+  tps: 1660.8783
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3797.01046
-  tps: 2709.09409
+  dps: 3698.17979
+  tps: 2734.82387
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1697.33093
-  tps: 1703.32851
+  dps: 1676.22888
+  tps: 1828.64954
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1048.7881
-  tps: 756.98458
+  dps: 1012.08697
+  tps: 857.36937
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1146.50115
-  tps: 757.94
+  dps: 1101.59712
+  tps: 859.02979
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 697.13484
-  tps: 930.12046
+  dps: 691.15443
+  tps: 980.19599
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 448.30586
-  tps: 331.69681
+  dps: 443.5942
+  tps: 384.6707
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 557.59465
-  tps: 378.56058
+  dps: 550.73934
+  tps: 440.44092
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1697.33093
-  tps: 1703.32851
+  dps: 1676.22888
+  tps: 1828.64954
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1048.7881
-  tps: 756.98458
+  dps: 1012.08697
+  tps: 857.36937
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1146.50115
-  tps: 757.94
+  dps: 1101.59712
+  tps: 859.02979
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 697.13484
-  tps: 930.12046
+  dps: 691.15443
+  tps: 980.19599
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 448.30586
-  tps: 331.69681
+  dps: 443.5942
+  tps: 384.6707
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 557.59465
-  tps: 378.56058
+  dps: 550.73934
+  tps: 440.44092
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2982.06512
-  tps: 2609.83949
+  dps: 2903.38694
+  tps: 2680.95538
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1490.54117
-  tps: 1064.52032
+  dps: 1441.03434
+  tps: 1151.8541
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1572.62881
-  tps: 1056.11768
+  dps: 1524.68471
+  tps: 1143.68196
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1208.83394
-  tps: 1299.16246
+  dps: 1188.7523
+  tps: 1338.63732
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 611.13197
-  tps: 445.90542
+  dps: 602.41276
+  tps: 495.01688
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 732.88532
-  tps: 501.23166
+  dps: 724.93941
+  tps: 558.03621
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2982.06512
-  tps: 2609.83949
+  dps: 2903.38694
+  tps: 2680.95538
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1490.54117
-  tps: 1064.52032
+  dps: 1441.03434
+  tps: 1151.8541
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1572.62881
-  tps: 1056.11768
+  dps: 1524.68471
+  tps: 1143.68196
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1208.83394
-  tps: 1299.16246
+  dps: 1188.7523
+  tps: 1338.63732
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 611.13197
-  tps: 445.90542
+  dps: 602.41276
+  tps: 495.01688
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 732.88532
-  tps: 501.23166
+  dps: 724.93941
+  tps: 558.03621
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1700.49944
-  tps: 1708.61205
+  dps: 1662.4237
+  tps: 1821.67252
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1054.78889
-  tps: 761.1608
+  dps: 1009.03844
+  tps: 857.89208
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1146.88795
-  tps: 758.95939
+  dps: 1100.6443
+  tps: 859.11635
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 694.47409
-  tps: 929.15607
+  dps: 683.61094
+  tps: 975.31887
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 443.47891
-  tps: 328.04664
+  dps: 439.5986
+  tps: 381.44109
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 557.24073
-  tps: 378.69615
+  dps: 550.08852
+  tps: 440.52271
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1700.49944
-  tps: 1708.61205
+  dps: 1662.4237
+  tps: 1821.67252
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1054.78889
-  tps: 761.1608
+  dps: 1009.03844
+  tps: 857.89208
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1146.88795
-  tps: 758.95939
+  dps: 1100.6443
+  tps: 859.11635
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 694.47409
-  tps: 929.15607
+  dps: 683.61094
+  tps: 975.31887
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 443.47891
-  tps: 328.04664
+  dps: 439.5986
+  tps: 381.44109
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 557.24073
-  tps: 378.69615
+  dps: 550.08852
+  tps: 440.52271
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2970.70789
-  tps: 2606.08085
+  dps: 2879.33727
+  tps: 2676.53128
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1477.71887
-  tps: 1055.3011
+  dps: 1425.91097
+  tps: 1138.22056
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1571.73004
-  tps: 1054.82811
+  dps: 1524.09443
+  tps: 1143.30805
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1192.84403
-  tps: 1289.17805
+  dps: 1182.24739
+  tps: 1333.35799
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 604.13128
-  tps: 441.23829
+  dps: 595.08055
+  tps: 487.80467
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 732.71552
-  tps: 501.61296
+  dps: 724.66056
+  tps: 558.09446
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2970.70789
-  tps: 2606.08085
+  dps: 2879.33727
+  tps: 2676.53128
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1477.71887
-  tps: 1055.3011
+  dps: 1425.91097
+  tps: 1138.22056
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1571.73004
-  tps: 1054.82811
+  dps: 1524.09443
+  tps: 1143.30805
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1192.84403
-  tps: 1289.17805
+  dps: 1182.24739
+  tps: 1333.35799
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 604.13128
-  tps: 441.23829
+  dps: 595.08055
+  tps: 487.80467
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 732.71552
-  tps: 501.61296
+  dps: 724.66056
+  tps: 558.09446
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3070.69645
-  tps: 2187.40531
+  dps: 2989.00696
+  tps: 2230.51955
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 2004.35599
-  tps: 2018.10964
+  dps: 1970.29271
+  tps: 2087.5134
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 2080.94272
-  tps: 2093.27791
+  dps: 2046.73609
+  tps: 2162.50344
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 2136.86054
-  tps: 2149.679
+  dps: 2092.01182
+  tps: 2209.56274
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 2053.30608
-  tps: 2066.60698
+  dps: 2018.76741
+  tps: 2139.7723
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 2004.13401
-  tps: 2017.95981
+  dps: 1970.12843
+  tps: 2087.42079
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 2050.69239
-  tps: 2063.58912
+  dps: 2016.60554
+  tps: 2132.96953
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 3298.42321
-  tps: 3345.02873
+  dps: 3194.7512
+  tps: 3398.00574
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 3235.89117
-  tps: 3282.52908
+  dps: 3151.35054
+  tps: 3358.81773
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1656.68535
-  tps: 1684.44568
+  dps: 1610.04903
+  tps: 1759.16051
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4494.16683
-  tps: 3199.90278
+  dps: 4378.51844
+  tps: 3232.46312
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2248.21231
-  tps: 2115.18395
+  dps: 2168.51472
+  tps: 2211.38674
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1401.72838
-  tps: 999.33601
+  dps: 1341.43735
+  tps: 1100.18594
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1500.81536
-  tps: 999.25961
+  dps: 1443.63232
+  tps: 1110.20647
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 872.13334
-  tps: 1071.82716
+  dps: 855.33029
+  tps: 1119.34336
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 572.30003
-  tps: 418.62313
+  dps: 562.63745
+  tps: 475.00885
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 692.84281
-  tps: 474.71131
+  dps: 682.67579
+  tps: 545.29469
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2248.21231
-  tps: 2115.18395
+  dps: 2168.51472
+  tps: 2211.38674
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1401.72838
-  tps: 999.33601
+  dps: 1341.43735
+  tps: 1100.18594
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1500.81536
-  tps: 999.25961
+  dps: 1443.63232
+  tps: 1110.20647
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 872.13334
-  tps: 1071.82716
+  dps: 855.33029
+  tps: 1119.34336
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 572.30003
-  tps: 418.62313
+  dps: 562.63745
+  tps: 475.00885
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 692.84281
-  tps: 474.71131
+  dps: 682.67579
+  tps: 545.29469
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 3579.82597
-  tps: 3042.7302
+  dps: 3487.47233
+  tps: 3128.16437
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1666.81437
-  tps: 1189.58492
+  dps: 1600.92952
+  tps: 1278.33383
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1872.01158
-  tps: 1265.65497
+  dps: 1791.19305
+  tps: 1343.89156
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1489.73813
-  tps: 1609.08068
+  dps: 1474.6294
+  tps: 1672.28331
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 666.1923
-  tps: 486.99103
+  dps: 654.79524
+  tps: 540.41022
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 840.44119
-  tps: 574.37328
+  dps: 824.97721
+  tps: 639.08267
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 3579.82597
-  tps: 3042.7302
+  dps: 3487.47233
+  tps: 3128.16437
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1666.81437
-  tps: 1189.58492
+  dps: 1600.92952
+  tps: 1278.33383
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1872.01158
-  tps: 1265.65497
+  dps: 1791.19305
+  tps: 1343.89156
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1489.73813
-  tps: 1609.08068
+  dps: 1474.6294
+  tps: 1672.28331
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 666.1923
-  tps: 486.99103
+  dps: 654.79524
+  tps: 540.41022
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 840.44119
-  tps: 574.37328
+  dps: 824.97721
+  tps: 639.08267
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2221.73788
-  tps: 2097.77013
+  dps: 2144.44588
+  tps: 2200.03771
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1395.63916
-  tps: 997.73883
+  dps: 1334.84494
+  tps: 1097.7291
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1502.67393
-  tps: 999.75951
+  dps: 1442.01293
+  tps: 1108.04278
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 851.77355
-  tps: 1058.20377
+  dps: 842.8942
+  tps: 1112.54526
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 564.03614
-  tps: 412.39715
+  dps: 550.01219
+  tps: 463.6741
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 692.96172
-  tps: 475.28574
+  dps: 683.71671
+  tps: 545.86255
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2221.73788
-  tps: 2097.77013
+  dps: 2144.44588
+  tps: 2200.03771
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1395.63916
-  tps: 997.73883
+  dps: 1334.84494
+  tps: 1097.7291
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1502.67393
-  tps: 999.75951
+  dps: 1442.01293
+  tps: 1108.04278
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 851.77355
-  tps: 1058.20377
+  dps: 842.8942
+  tps: 1112.54526
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 564.03614
-  tps: 412.39715
+  dps: 550.01219
+  tps: 463.6741
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 692.96172
-  tps: 475.28574
+  dps: 683.71671
+  tps: 545.86255
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 3558.57675
-  tps: 3037.2645
+  dps: 3467.91663
+  tps: 3116.06993
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1653.68457
-  tps: 1180.64918
+  dps: 1589.92844
+  tps: 1270.88427
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1871.9414
-  tps: 1265.98741
+  dps: 1790.46286
+  tps: 1343.22382
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1479.35736
-  tps: 1604.53929
+  dps: 1467.39429
+  tps: 1661.68053
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 660.71475
-  tps: 481.9224
+  dps: 651.70309
+  tps: 535.79105
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 840.11016
-  tps: 574.63875
+  dps: 824.62424
+  tps: 639.42802
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 3558.57675
-  tps: 3037.2645
+  dps: 3467.91663
+  tps: 3116.06993
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1653.68457
-  tps: 1180.64918
+  dps: 1589.92844
+  tps: 1270.88427
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1871.9414
-  tps: 1265.98741
+  dps: 1790.46286
+  tps: 1343.22382
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1479.35736
-  tps: 1604.53929
+  dps: 1467.39429
+  tps: 1661.68053
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 660.71475
-  tps: 481.9224
+  dps: 651.70309
+  tps: 535.79105
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 840.11016
-  tps: 574.63875
+  dps: 824.62424
+  tps: 639.42802
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3694.82427
-  tps: 2630.83207
+  dps: 3593.27982
+  tps: 2678.59625
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1635.1316
-  tps: 1664.29308
+  dps: 1598.41899
+  tps: 1727.99189
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1688.84923
-  tps: 1716.29692
+  dps: 1651.91956
+  tps: 1780.0778
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1795.97952
-  tps: 1823.8466
+  dps: 1758.52312
+  tps: 1895.71779
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1682.25991
-  tps: 1711.09254
+  dps: 1644.23664
+  tps: 1778.06895
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1634.69698
-  tps: 1663.58176
+  dps: 1597.97999
+  tps: 1727.78857
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1667.57865
-  tps: 1695.54813
+  dps: 1630.72993
+  tps: 1759.62366
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 3412.76103
-  tps: 3434.00923
+  dps: 3302.19157
+  tps: 3481.66702
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 3348.44668
-  tps: 3372.6897
+  dps: 3255.8813
+  tps: 3438.761
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1384.87958
-  tps: 1420.98889
+  dps: 1347.3404
+  tps: 1503.51035
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 5632.52257
-  tps: 3961.29729
+  dps: 5474.11845
+  tps: 3968.95509
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 3348.16967
-  tps: 2851.40435
+  dps: 3236.56089
+  tps: 2917.66576
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2461.70047
-  tps: 1742.1928
+  dps: 2368.94593
+  tps: 1813.28568
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2545.56707
-  tps: 1750.14675
+  dps: 2455.63314
+  tps: 1804.70787
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 1305.91533
-  tps: 1430.43306
+  dps: 1274.53902
+  tps: 1468.16017
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 957.94095
-  tps: 698.99721
+  dps: 944.66038
+  tps: 755.18855
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 1097.63282
-  tps: 768.39943
+  dps: 1081.04306
+  tps: 818.21249
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 3348.16967
-  tps: 2851.40435
+  dps: 3236.56089
+  tps: 2917.66576
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2461.70047
-  tps: 1742.1928
+  dps: 2368.94593
+  tps: 1813.28568
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2545.56707
-  tps: 1750.14675
+  dps: 2455.63314
+  tps: 1804.70787
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 1305.91533
-  tps: 1430.43306
+  dps: 1274.53902
+  tps: 1468.16017
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 957.94095
-  tps: 698.99721
+  dps: 944.66038
+  tps: 755.18855
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 1097.63282
-  tps: 768.39943
+  dps: 1081.04306
+  tps: 818.21249
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 4893.1117
-  tps: 3948.4531
+  dps: 4729.40596
+  tps: 3976.78977
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 3270.90637
-  tps: 2310.78979
+  dps: 3160.91254
+  tps: 2367.69639
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 3402.32232
-  tps: 2349.35064
+  dps: 3290.88316
+  tps: 2395.52337
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 1808.52687
-  tps: 1799.27266
+  dps: 1788.06326
+  tps: 1849.60639
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 1146.57066
-  tps: 832.2922
+  dps: 1135.32032
+  tps: 889.22037
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 1331.08512
-  tps: 931.52248
+  dps: 1310.00367
+  tps: 981.03789
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 4893.1117
-  tps: 3948.4531
+  dps: 4729.40596
+  tps: 3976.78977
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 3270.90637
-  tps: 2310.78979
+  dps: 3160.91254
+  tps: 2367.69639
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 3402.32232
-  tps: 2349.35064
+  dps: 3290.88316
+  tps: 2395.52337
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 1808.52687
-  tps: 1799.27266
+  dps: 1788.06326
+  tps: 1849.60639
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 1146.57066
-  tps: 832.2922
+  dps: 1135.32032
+  tps: 889.22037
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 1331.08512
-  tps: 931.52248
+  dps: 1310.00367
+  tps: 981.03789
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 3195.66056
-  tps: 2746.14483
+  dps: 3096.99688
+  tps: 2838.31179
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2386.05343
-  tps: 1695.14374
+  dps: 2302.02359
+  tps: 1771.7841
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2473.76338
-  tps: 1705.34348
+  dps: 2387.2223
+  tps: 1760.0044
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 1225.44254
-  tps: 1365.47408
+  dps: 1200.02961
+  tps: 1411.59525
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 921.17854
-  tps: 674.21287
+  dps: 908.86737
+  tps: 728.72321
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 1056.6532
-  tps: 740.85618
+  dps: 1038.89907
+  tps: 788.1463
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 3195.66056
-  tps: 2746.14483
+  dps: 3096.99688
+  tps: 2838.31179
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2386.05343
-  tps: 1695.14374
+  dps: 2302.02359
+  tps: 1771.7841
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2473.76338
-  tps: 1705.34348
+  dps: 2387.2223
+  tps: 1760.0044
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 1225.44254
-  tps: 1365.47408
+  dps: 1200.02961
+  tps: 1411.59525
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 921.17854
-  tps: 674.21287
+  dps: 908.86737
+  tps: 728.72321
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 1056.6532
-  tps: 740.85618
+  dps: 1038.89907
+  tps: 788.1463
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 4833.56937
-  tps: 3929.20283
+  dps: 4684.3191
+  tps: 3967.86438
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 3199.52778
-  tps: 2263.42456
+  dps: 3090.97775
+  tps: 2321.82372
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 3325.48383
-  tps: 2301.05512
+  dps: 3212.00702
+  tps: 2344.98246
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 1783.89234
-  tps: 1782.99962
+  dps: 1765.05245
+  tps: 1835.62579
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 1131.04995
-  tps: 821.54525
+  dps: 1115.06503
+  tps: 875.54843
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 1298.2265
-  tps: 909.85626
+  dps: 1278.40818
+  tps: 959.92349
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 4833.56937
-  tps: 3929.20283
+  dps: 4684.3191
+  tps: 3967.86438
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 3199.52778
-  tps: 2263.42456
+  dps: 3090.97775
+  tps: 2321.82372
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 3325.48383
-  tps: 2301.05512
+  dps: 3212.00702
+  tps: 2344.98246
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 1783.89234
-  tps: 1782.99962
+  dps: 1765.05245
+  tps: 1835.62579
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 1131.04995
-  tps: 821.54525
+  dps: 1115.06503
+  tps: 875.54843
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_dw-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 1298.2265
-  tps: 909.85626
+  dps: 1278.40818
+  tps: 959.92349
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 4784.29182
-  tps: 3364.52258
+  dps: 4641.56163
+  tps: 3381.4061
  }
 }
diff --git a/sim/shaman/flame_shock.go b/sim/shaman/flame_shock.go
index 045a151473..779bc04819 100644
--- a/sim/shaman/flame_shock.go
+++ b/sim/shaman/flame_shock.go
@@ -21,7 +21,12 @@ var FlameShockLevel = [FlameShockRanks + 1]int{0, 10, 18, 28, 40, 52, 60}
 func (shaman *Shaman) registerFlameShockSpell(shockTimer *core.Timer) {
 	shaman.FlameShock = make([]*core.Spell, FlameShockRanks+1)
 
-	for rank := 1; rank <= FlameShockRanks; rank++ {
+	maxRank := FlameShockRanks
+	if !shaman.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
+	for rank := 1; rank <= maxRank; rank++ {
 		if FlameShockLevel[rank] <= int(shaman.Level) {
 			shaman.FlameShock[rank] = shaman.RegisterSpell(shaman.newFlameShockSpell(rank, shockTimer))
 		}
diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results
index ca6e7adba7..0a3a4b72d9 100644
--- a/sim/shaman/warden/TestWardenShaman.results
+++ b/sim/shaman/warden/TestWardenShaman.results
@@ -1,8 +1,8 @@
 character_stats_results: {
  key: "TestWardenShaman-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 400.4
-  final_stats: 225.5
+  final_stats: 380.6
+  final_stats: 213.4
   final_stats: 607.2
   final_stats: 295.9
   final_stats: 193.6
@@ -18,21 +18,21 @@ character_stats_results: {
   final_stats: 35.30071
   final_stats: 0
   final_stats: 0
-  final_stats: 1881.8
+  final_stats: 1793.2
   final_stats: 6
-  final_stats: 40.1554
+  final_stats: 39.54072
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 5678.5
   final_stats: 0
   final_stats: 0
-  final_stats: 5820
+  final_stats: 5795.8
   final_stats: 891
   final_stats: 34
   final_stats: 21.36
   final_stats: 45
-  final_stats: 15.5154
+  final_stats: 14.90072
   final_stats: 6.36
   final_stats: 0
   final_stats: 8815
@@ -50,12 +50,12 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestWardenShaman-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.10827
+  weights: 1.09509
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.48771
+  weights: 0.46804
   weights: 0
   weights: 0
   weights: 0
@@ -67,7 +67,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.50376
+  weights: 0.49777
   weights: 0
   weights: 0
   weights: 0
@@ -78,7 +78,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.89922
+  weights: 1.80652
   weights: 0
   weights: 0
   weights: 0
@@ -99,154 +99,154 @@ stat_weights_results: {
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1153.83821
-  tps: 1192.87636
+  dps: 1119.32077
+  tps: 1251.72755
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1201.90518
-  tps: 1239.38377
+  dps: 1166.8392
+  tps: 1298.01079
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1191.48492
-  tps: 1233.25083
+  dps: 1148.40928
+  tps: 1290.20132
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1181.3229
-  tps: 1220.24068
+  dps: 1145.35106
+  tps: 1282.06896
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1153.67096
-  tps: 1192.31616
+  dps: 1118.98105
+  tps: 1251.45351
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1186.55774
-  tps: 1224.33803
+  dps: 1151.56028
+  tps: 1283.15853
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 1769.46092
-  tps: 1960.14912
+  dps: 1708.6723
+  tps: 2038.09654
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1054.18792
-  tps: 1085.80313
+  dps: 1023.69951
+  tps: 1166.35483
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 2018.52898
-  tps: 1615.48642
+  dps: 1935.12789
+  tps: 1566.42129
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2149.86981
-  tps: 3059.34704
+  dps: 2066.76497
+  tps: 2979.37184
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 950.7404
-  tps: 826.797
+  dps: 900.93881
+  tps: 789.97273
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1286.37461
-  tps: 1090.80706
+  dps: 1209.57119
+  tps: 1034.49585
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 677.87355
-  tps: 1200.65071
+  dps: 670.63735
+  tps: 1197.1386
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 335.86762
-  tps: 277.02222
+  dps: 324.58448
+  tps: 273.8986
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 542.29188
-  tps: 434.9758
+  dps: 521.28501
+  tps: 424.4818
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2132.19492
-  tps: 3032.92462
+  dps: 2025.8279
+  tps: 2932.83737
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 950.47627
-  tps: 825.17646
+  dps: 888.08508
+  tps: 785.77235
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1273.7313
-  tps: 1085.23588
+  dps: 1224.50376
+  tps: 1053.22
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 665.8013
-  tps: 1180.67845
+  dps: 641.79907
+  tps: 1166.27235
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 329.59646
-  tps: 271.35849
+  dps: 316.8196
+  tps: 267.35806
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 523.82093
-  tps: 418.13457
+  dps: 508.10092
+  tps: 415.86873
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1740.37646
-  tps: 1414.49341
+  dps: 1651.96588
+  tps: 1362.61137
  }
 }
diff --git a/sim/warlock/corruption.go b/sim/warlock/corruption.go
index 0242cefdfd..e2e884e19c 100644
--- a/sim/warlock/corruption.go
+++ b/sim/warlock/corruption.go
@@ -108,7 +108,11 @@ func (warlock *Warlock) getCorruptionConfig(rank int) core.SpellConfig {
 func (warlock *Warlock) registerCorruptionSpell() {
 	warlock.Corruption = make([]*core.Spell, 0)
 
-	maxRank := core.TernaryInt(core.IncludeAQ, CorruptionRanks, CorruptionRanks-1)
+	maxRank := CorruptionRanks
+	if !warlock.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
 	for rank := 1; rank <= maxRank; rank++ {
 		config := warlock.getCorruptionConfig(rank)
 
diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results
index 9d33af2740..023888fce8 100644
--- a/sim/warlock/dps/TestAffliction.results
+++ b/sim/warlock/dps/TestAffliction.results
@@ -99,8 +99,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestAffliction-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 188.1
-  final_stats: 187
+  final_stats: 168.3
+  final_stats: 174.9
   final_stats: 433.895
   final_stats: 357.5
   final_stats: 235.4
@@ -116,21 +116,21 @@ character_stats_results: {
   final_stats: 37.59875
   final_stats: 0
   final_stats: 0
-  final_stats: 1008.1
+  final_stats: 939.3
   final_stats: 6
-  final_stats: 33.35
+  final_stats: 32.745
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 6455.5
   final_stats: 0
   final_stats: 0
-  final_stats: 1379
+  final_stats: 1354.8
   final_stats: 740
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 11.35
+  final_stats: 10.745
   final_stats: 5
   final_stats: 0
   final_stats: 5872.95
diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
index f32ff13ecf..2a68d4034e 100644
--- a/sim/warlock/dps/TestDestruction.results
+++ b/sim/warlock/dps/TestDestruction.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestDestruction-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 188.1
-  final_stats: 187
+  final_stats: 168.3
+  final_stats: 174.9
   final_stats: 488.796
   final_stats: 377.3
   final_stats: 223.63
@@ -165,21 +165,21 @@ character_stats_results: {
   final_stats: 45.92545
   final_stats: 0
   final_stats: 0
-  final_stats: 1008.1
+  final_stats: 939.3
   final_stats: 9
-  final_stats: 41.35
+  final_stats: 40.745
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 6752.5
   final_stats: 0
   final_stats: 0
-  final_stats: 1369
+  final_stats: 1344.8
   final_stats: 740
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 11.35
+  final_stats: 10.745
   final_stats: 5
   final_stats: 0
   final_stats: 6421.96
diff --git a/sim/warlock/immolate.go b/sim/warlock/immolate.go
index 39f53d9667..219f79af83 100644
--- a/sim/warlock/immolate.go
+++ b/sim/warlock/immolate.go
@@ -132,7 +132,11 @@ func (warlock *Warlock) getActiveImmolateSpell(target *core.Unit) *core.Spell {
 func (warlock *Warlock) registerImmolateSpell() {
 	warlock.Immolate = make([]*core.Spell, 0)
 
-	maxRank := core.TernaryInt(core.IncludeAQ, ImmolateRanks, ImmolateRanks-1)
+	maxRank := ImmolateRanks
+	if !warlock.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
 	for rank := 1; rank <= maxRank; rank++ {
 		config := warlock.getImmolateConfig(rank)
 
diff --git a/sim/warlock/shadowbolt.go b/sim/warlock/shadowbolt.go
index c2a62c1866..72f048c030 100644
--- a/sim/warlock/shadowbolt.go
+++ b/sim/warlock/shadowbolt.go
@@ -92,7 +92,11 @@ func (warlock *Warlock) getShadowBoltBaseConfig(rank int) core.SpellConfig {
 func (warlock *Warlock) registerShadowBoltSpell() {
 	warlock.ShadowBolt = make([]*core.Spell, 0)
 
-	maxRank := core.TernaryInt(core.IncludeAQ, ShadowBoltRanks, ShadowBoltRanks-1)
+	maxRank := ShadowBoltRanks
+	if !warlock.Env.UseAQSpellRanks {
+		maxRank -= 1
+	}
+
 	for rank := 1; rank <= maxRank; rank++ {
 		config := warlock.getShadowBoltBaseConfig(rank)
 
diff --git a/sim/warlock/tank/TestAffliction.results b/sim/warlock/tank/TestAffliction.results
index 6e8a5c03b8..5522fef52e 100644
--- a/sim/warlock/tank/TestAffliction.results
+++ b/sim/warlock/tank/TestAffliction.results
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestAffliction-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 183.7
-  final_stats: 182.6
+  final_stats: 163.9
+  final_stats: 170.5
   final_stats: 629.97
   final_stats: 254.1
   final_stats: 221.1
@@ -67,21 +67,21 @@ character_stats_results: {
   final_stats: 28.89265
   final_stats: 0
   final_stats: 0
-  final_stats: 1003.7
+  final_stats: 934.9
   final_stats: 8
-  final_stats: 26.13
+  final_stats: 25.525
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 4904.5
   final_stats: 0
   final_stats: 0
-  final_stats: 2115.2
+  final_stats: 2091
   final_stats: 740
   final_stats: 121
   final_stats: 9.84
   final_stats: 0
-  final_stats: 15.97
+  final_stats: 15.365
   final_stats: 9.84
   final_stats: 0
   final_stats: 7833.7
@@ -151,9 +151,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 4.41469
+  weights: 4.41496
   weights: 0
-  weights: 0.98931
+  weights: 0.98929
   weights: 0
   weights: 0
   weights: 0
@@ -161,8 +161,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 12.49666
-  weights: 9.16248
+  weights: 12.4956
+  weights: 9.161
   weights: 0
   weights: 0
   weights: 0
@@ -269,81 +269,81 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1454.89684
-  tps: 1687.92952
+  dps: 1454.10425
+  tps: 1687.13693
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-DeathmistRaiment"
  value: {
-  dps: 1284.10688
-  tps: 1449.92251
+  dps: 1283.42767
+  tps: 1449.24329
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1457.50175
-  tps: 1690.57541
+  dps: 1456.7066
+  tps: 1689.78026
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 1999.49726
-  tps: 3972.43194
+  dps: 1997.6119
+  tps: 3969.09485
   hps: 446.46635
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 1243.30681
-  tps: 1403.70299
+  dps: 1242.58718
+  tps: 1402.98335
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-Kezan'sUnstoppableTaint-231346"
  value: {
-  dps: 1986.84411
-  tps: 3956.57268
+  dps: 1984.95358
+  tps: 3953.22645
   hps: 434.10525
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1454.89684
-  tps: 1687.92952
+  dps: 1454.10425
+  tps: 1687.13693
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1634.67641
-  tps: 3259.56615
+  dps: 1633.0089
+  tps: 3256.61466
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1615.70586
-  tps: 3217.56295
+  dps: 1613.95223
+  tps: 3214.45902
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-AllItems-ZilaGular-223214"
  value: {
-  dps: 1997.64567
-  tps: 3972.43194
+  dps: 1995.76031
+  tps: 3969.09485
   hps: 446.46635
  }
 }
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 2017.58299
-  tps: 4011.0149
+  dps: 2015.67251
+  tps: 4007.63335
   hps: 449.53134
  }
 }
@@ -398,8 +398,8 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1979.69481
-  tps: 3938.26721
+  dps: 1978.93583
+  tps: 3936.92383
   hps: 449.69936
  }
 }
diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results
index bf63dd48ac..d7c78fc9e5 100644
--- a/sim/warlock/tank/TestDemonology.results
+++ b/sim/warlock/tank/TestDemonology.results
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestDemonology-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 183.7
-  final_stats: 182.6
+  final_stats: 163.9
+  final_stats: 170.5
   final_stats: 724.4655
   final_stats: 254.1
   final_stats: 210.045
@@ -67,21 +67,21 @@ character_stats_results: {
   final_stats: 28.89265
   final_stats: 0
   final_stats: 0
-  final_stats: 1003.7
+  final_stats: 934.9
   final_stats: 8
-  final_stats: 26.13
+  final_stats: 25.525
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 4904.5
   final_stats: 0
   final_stats: 0
-  final_stats: 2115.2
+  final_stats: 2091
   final_stats: 740
   final_stats: 121
   final_stats: 9.84
   final_stats: 0
-  final_stats: 15.97
+  final_stats: 15.365
   final_stats: 9.84
   final_stats: 0
   final_stats: 8778.655
@@ -151,9 +151,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.37627
+  weights: -0.34658
   weights: 0
-  weights: 0.82603
+  weights: 0.80619
   weights: 0
   weights: 0
   weights: 0
@@ -161,8 +161,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 18.58084
-  weights: 8.34795
+  weights: 18.36049
+  weights: 8.4516
   weights: 0
   weights: 0
   weights: 0
@@ -269,95 +269,95 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1147.38615
-  tps: 416.74601
+  dps: 1108.15617
+  tps: 416.05743
   hps: 228.25902
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-DeathmistRaiment"
  value: {
-  dps: 109.79237
-  tps: 120.77467
+  dps: 107.93492
+  tps: 118.91722
   hps: 4.3855
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1150.20075
-  tps: 414.38849
+  dps: 1110.6653
+  tps: 413.67803
   hps: 227.46431
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 2253.2068
-  tps: 4592.07365
+  dps: 2215.4787
+  tps: 4588.1165
   hps: 402.51414
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 107.76671
-  tps: 118.65756
+  dps: 105.90832
+  tps: 116.79917
   hps: 4.1892
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-Kezan'sUnstoppableTaint-231346"
  value: {
-  dps: 2326.0892
-  tps: 4547.47334
+  dps: 2283.76489
+  tps: 4543.56793
   hps: 395.53501
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1147.38615
-  tps: 416.74601
+  dps: 1108.15617
+  tps: 416.05743
   hps: 228.25902
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1250.81307
-  tps: 1353.1845
+  dps: 1213.70555
+  tps: 1351.18381
   hps: 217.82529
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1223.38191
-  tps: 1337.13652
+  dps: 1187.96752
+  tps: 1334.96332
   hps: 217.87458
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-AllItems-ZilaGular-223214"
  value: {
-  dps: 2253.2068
-  tps: 4592.07365
+  dps: 2215.4787
+  tps: 4588.1165
   hps: 402.51414
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 2261.35125
-  tps: 4625.87505
+  dps: 2224.51241
+  tps: 4621.9
   hps: 410.19321
  }
 }
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2846.62906
+  dps: 2803.43959
   tps: 9134.65909
   hps: 413.40117
  }
@@ -365,7 +365,7 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2199.06432
+  dps: 2164.26687
   tps: 4447.82641
   hps: 411.69711
  }
@@ -373,7 +373,7 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-Settings-Orc-p4_demo_tank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2171.73853
+  dps: 2136.55407
   tps: 4420.23142
   hps: 403.79946
  }
@@ -405,8 +405,8 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2216.22136
-  tps: 4510.2395
+  dps: 2179.3617
+  tps: 4508.63908
   hps: 402.96262
  }
 }
diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results
index 2dacb3f155..af0da7f419 100644
--- a/sim/warlock/tank/TestDestruction.results
+++ b/sim/warlock/tank/TestDestruction.results
@@ -148,8 +148,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestDestruction-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 183.7
-  final_stats: 182.6
+  final_stats: 163.9
+  final_stats: 170.5
   final_stats: 629.97
   final_stats: 254.1
   final_stats: 221.1
@@ -165,21 +165,21 @@ character_stats_results: {
   final_stats: 28.89265
   final_stats: 0
   final_stats: 0
-  final_stats: 1003.7
+  final_stats: 934.9
   final_stats: 8
-  final_stats: 26.13
+  final_stats: 25.525
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 4904.5
   final_stats: 0
   final_stats: 0
-  final_stats: 2115.2
+  final_stats: 2091
   final_stats: 740
   final_stats: 121
   final_stats: 9.84
   final_stats: 0
-  final_stats: 15.97
+  final_stats: 15.365
   final_stats: 9.84
   final_stats: 0
   final_stats: 7833.7
@@ -347,9 +347,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.79094
+  weights: 0.79014
   weights: 0
-  weights: 0.77668
+  weights: 0.77666
   weights: 0
   weights: 0
   weights: 0
@@ -357,8 +357,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 15.66822
-  weights: 11.3956
+  weights: 15.66683
+  weights: 11.39532
   weights: 0
   weights: 0
   weights: 0
@@ -591,81 +591,81 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1528.75925
-  tps: 1877.95301
+  dps: 1528.06807
+  tps: 1877.26183
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-DeathmistRaiment"
  value: {
-  dps: 1329.85818
-  tps: 1590.50579
+  dps: 1329.2713
+  tps: 1589.91891
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1521.49027
-  tps: 1869.47559
+  dps: 1520.79508
+  tps: 1868.7804
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 2026.77276
-  tps: 4207.32274
+  dps: 2024.88593
+  tps: 4203.98306
   hps: 425.86314
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 1283.88934
-  tps: 1528.77242
+  dps: 1283.26413
+  tps: 1528.1472
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-Kezan'sUnstoppableTaint-231346"
  value: {
-  dps: 2013.64777
-  tps: 4193.16
+  dps: 2011.76178
+  tps: 4189.82179
   hps: 413.07278
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1528.75925
-  tps: 1877.95301
+  dps: 1528.06807
+  tps: 1877.26183
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1682.71767
-  tps: 3540.83761
+  dps: 1681.04875
+  tps: 3537.88363
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1664.70649
-  tps: 3486.83317
+  dps: 1662.9513
+  tps: 3483.72648
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-AllItems-ZilaGular-223214"
  value: {
-  dps: 2024.60636
-  tps: 4207.32274
+  dps: 2022.71954
+  tps: 4203.98306
   hps: 425.86314
  }
 }
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 2037.85148
-  tps: 4225.97503
+  dps: 2035.94149
+  tps: 4222.59434
   hps: 417.42547
  }
 }
@@ -720,8 +720,8 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1987.43397
-  tps: 4131.18703
+  dps: 1986.67457
+  tps: 4129.84291
   hps: 408.2506
  }
 }
diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results
index a96a5692bb..b4587d9a43 100644
--- a/sim/warrior/dps_warrior/TestDualWieldWarrior.results
+++ b/sim/warrior/dps_warrior/TestDualWieldWarrior.results
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 609.4
-  final_stats: 347.6
+  final_stats: 589.6
+  final_stats: 335.5
   final_stats: 511.06
   final_stats: 102.3
   final_stats: 135.3
@@ -67,21 +67,21 @@ character_stats_results: {
   final_stats: 30
   final_stats: 0
   final_stats: 0
-  final_stats: 2340.8
+  final_stats: 2252.2
   final_stats: 6
-  final_stats: 48.38
+  final_stats: 47.775
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 5324.2
+  final_stats: 5300
   final_stats: 872
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 17.38
+  final_stats: 16.775
   final_stats: 5
   final_stats: 0
   final_stats: 6919.6
@@ -99,8 +99,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 771.65
-  final_stats: 530.035
+  final_stats: 748.88
+  final_stats: 516.12
   final_stats: 680.823
   final_stats: 117.645
   final_stats: 155.595
@@ -116,21 +116,21 @@ character_stats_results: {
   final_stats: 26
   final_stats: 0
   final_stats: 0
-  final_stats: 2751.3
+  final_stats: 2656.76
   final_stats: 5
-  final_stats: 53.50175
+  final_stats: 52.806
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 6345.07
+  final_stats: 6317.24
   final_stats: 958
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 26.50175
+  final_stats: 25.806
   final_stats: 5
   final_stats: 0
   final_stats: 8617.23
@@ -197,8 +197,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.40707
-  weights: 1.33518
+  weights: 1.78081
+  weights: 1.04651
   weights: 0
   weights: 0
   weights: 0
@@ -214,9 +214,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.03794
-  weights: 8.62043
-  weights: 25.89745
+  weights: 0.73787
+  weights: 27.64101
+  weights: 11.90577
   weights: 0
   weights: 0
   weights: 0
@@ -246,8 +246,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.80984
-  weights: 1.39912
+  weights: 1.31453
+  weights: 0.4614
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.44271
-  weights: 38.00802
-  weights: 27.29314
+  weights: 0.09484
+  weights: 47.24565
+  weights: 12.58704
   weights: 0
   weights: 0
   weights: 0
@@ -400,71 +400,71 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BanishedMartyr'sFullPlate"
  value: {
-  dps: 2734.79997
-  tps: 2361.07294
+  dps: 1917.36697
+  tps: 1637.67577
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BattlegearofHeroism"
  value: {
-  dps: 2091.66454
-  tps: 1843.81436
+  dps: 1627.88908
+  tps: 1401.49235
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BloodGuard'sPlate"
  value: {
-  dps: 2476.72938
-  tps: 2140.4297
+  dps: 1716.70045
+  tps: 1468.85174
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-EmeraldDreamPlate"
  value: {
-  dps: 2445.42348
-  tps: 2114.82185
+  dps: 1697.10688
+  tps: 1451.86207
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-Knight-Lieutenant'sPlate"
  value: {
-  dps: 2476.72938
-  tps: 2140.4297
+  dps: 1716.70045
+  tps: 1468.85174
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-WailingBerserker'sPlateArmor"
  value: {
-  dps: 2894.82985
-  tps: 2494.06906
+  dps: 2013.93581
+  tps: 1715.69653
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3755.83822
-  tps: 2944.50624
+  dps: 2604.32293
+  tps: 2031.45679
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1703.92938
-  tps: 1629.31977
+  dps: 1665.94355
+  tps: 1596.17137
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 536.57449
-  tps: 484.94771
+  dps: 527.2622
+  tps: 477.94961
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 734.83379
-  tps: 641.13374
+  dps: 721.71303
+  tps: 631.12714
  }
 }
 dps_results: {
@@ -491,22 +491,22 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1819.00008
-  tps: 1767.63053
+  dps: 1769.78297
+  tps: 1723.58023
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 554.71918
-  tps: 499.08325
+  dps: 542.95149
+  tps: 490.13699
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 766.95397
-  tps: 664.79879
+  dps: 749.89699
+  tps: 651.56498
  }
 }
 dps_results: {
@@ -533,78 +533,78 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2940.88422
-  tps: 2312.51339
+  dps: 1877.31565
+  tps: 1473.39092
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BanishedMartyr'sFullPlate"
  value: {
-  dps: 3200.41281
-  tps: 2742.63586
+  dps: 2176.75881
+  tps: 1850.88712
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism"
  value: {
-  dps: 2213.78724
-  tps: 1935.15098
+  dps: 1655.82506
+  tps: 1418.83458
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BloodGuard'sPlate"
  value: {
-  dps: 2689.23659
-  tps: 2309.40467
+  dps: 1813.69064
+  tps: 1544.66914
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-EmeraldDreamPlate"
  value: {
-  dps: 2647.96124
-  tps: 2275.98318
+  dps: 1790.11771
+  tps: 1524.70371
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-Knight-Lieutenant'sPlate"
  value: {
-  dps: 2689.23659
-  tps: 2309.40467
+  dps: 1813.69064
+  tps: 1544.66914
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-WailingBerserker'sPlateArmor"
  value: {
-  dps: 3391.29665
-  tps: 2901.7154
+  dps: 2266.9028
+  tps: 1925.02697
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4451.20607
-  tps: 3463.82531
+  dps: 3081.77825
+  tps: 2385.7073
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2049.98385
-  tps: 1886.22477
+  dps: 1986.61961
+  tps: 1832.45681
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 551.99607
-  tps: 474.43667
+  dps: 532.18894
+  tps: 459.46544
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 770.71789
-  tps: 638.82054
+  dps: 744.60906
+  tps: 618.86583
  }
 }
 dps_results: {
@@ -631,22 +631,22 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1575.55745
-  tps: 1523.09005
+  dps: 1521.73986
+  tps: 1476.21534
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 443.12993
-  tps: 390.62164
+  dps: 428.3458
+  tps: 379.63664
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 572.55118
-  tps: 499.88168
+  dps: 555.21301
+  tps: 486.61054
  }
 }
 dps_results: {
@@ -673,22 +673,22 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2162.45829
-  tps: 1993.03598
+  dps: 2102.72857
+  tps: 1941.96576
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 560.24186
-  tps: 479.84152
+  dps: 544.48574
+  tps: 468.11303
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 820.77332
-  tps: 668.71836
+  dps: 798.99235
+  tps: 652.50089
  }
 }
 dps_results: {
@@ -715,22 +715,22 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1355.06557
-  tps: 1320.37037
+  dps: 1316.20955
+  tps: 1286.88724
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 450.06382
-  tps: 391.26714
+  dps: 436.38607
+  tps: 381.15794
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 597.20269
-  tps: 482.66014
+  dps: 581.5269
+  tps: 471.52047
  }
 }
 dps_results: {
@@ -757,7 +757,7 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3497.25092
-  tps: 2709.13209
+  dps: 2219.7789
+  tps: 1715.90344
  }
 }
diff --git a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results
index 38f3d41f63..e16fda4f4d 100644
--- a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results
+++ b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results
@@ -50,8 +50,8 @@ character_stats_results: {
 character_stats_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 791.89
-  final_stats: 541.42
+  final_stats: 769.12
+  final_stats: 527.505
   final_stats: 685.18725
   final_stats: 117.645
   final_stats: 155.595
@@ -67,21 +67,21 @@ character_stats_results: {
   final_stats: 25
   final_stats: 0
   final_stats: 0
-  final_stats: 2793.78
+  final_stats: 2699.24
   final_stats: 5
-  final_stats: 53.071
+  final_stats: 52.37525
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 6354.84
+  final_stats: 6327.01
   final_stats: 960
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 27.071
+  final_stats: 26.37525
   final_stats: 5
   final_stats: 0
   final_stats: 8660.8725
@@ -148,8 +148,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.21428
-  weights: 1.7221
+  weights: 2.64165
+  weights: 0.62602
   weights: 0
   weights: 0
   weights: 0
@@ -165,9 +165,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.90727
+  weights: 0.99568
   weights: 0
-  weights: 22.21408
+  weights: 15.12366
   weights: 0
   weights: 0
   weights: 0
@@ -302,71 +302,71 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BanishedMartyr'sFullPlate"
  value: {
-  dps: 2656.04289
-  tps: 2205.21798
+  dps: 2530.714
+  tps: 2068.33164
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism"
  value: {
-  dps: 1662.50805
-  tps: 1409.09944
+  dps: 1505.0687
+  tps: 1242.24644
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-BloodGuard'sPlate"
  value: {
-  dps: 1986.44062
-  tps: 1671.25019
+  dps: 1663.40303
+  tps: 1372.66967
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-EmeraldDreamPlate"
  value: {
-  dps: 1969.98686
-  tps: 1658.60081
+  dps: 1636.7618
+  tps: 1351.1662
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-Knight-Lieutenant'sPlate"
  value: {
-  dps: 1986.44062
-  tps: 1671.25019
+  dps: 1663.40303
+  tps: 1372.66967
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-AllItems-WailingBerserker'sPlateArmor"
  value: {
-  dps: 2864.47873
-  tps: 2378.35549
+  dps: 2703.36439
+  tps: 2208.14519
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4431.17269
-  tps: 3359.30851
+  dps: 3963.60896
+  tps: 2883.60481
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 955.39059
-  tps: 721.38511
+  dps: 931.05344
+  tps: 705.33974
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 937.06718
-  tps: 613.7884
+  dps: 912.73003
+  tps: 597.74303
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1232.56461
-  tps: 818.82598
+  dps: 1201.18963
+  tps: 797.90823
  }
 }
 dps_results: {
@@ -393,22 +393,22 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 678.56804
-  tps: 556.00605
+  dps: 661.56813
+  tps: 545.1318
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 666.84861
-  tps: 453.6154
+  dps: 649.8487
+  tps: 442.71253
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1029.13845
-  tps: 730.26201
+  dps: 997.67369
+  tps: 707.75638
  }
 }
 dps_results: {
@@ -435,22 +435,22 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 984.25997
-  tps: 743.21253
+  dps: 961.11539
+  tps: 727.97739
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 966.70169
-  tps: 636.1508
+  dps: 943.55712
+  tps: 620.91566
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1325.92274
-  tps: 885.17257
+  dps: 1294.53289
+  tps: 864.1922
  }
 }
 dps_results: {
@@ -477,22 +477,22 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 702.45391
-  tps: 574.74726
+  dps: 680.31566
+  tps: 559.49622
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 690.95529
-  tps: 472.44091
+  dps: 669.10327
+  tps: 457.41886
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1110.55468
-  tps: 791.68289
+  dps: 1083.36177
+  tps: 772.24014
  }
 }
 dps_results: {
@@ -519,7 +519,7 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3648.16757
-  tps: 2746.4092
+  dps: 3200.21305
+  tps: 2311.08628
  }
 }
diff --git a/sim/warrior/heroic_strike_cleave.go b/sim/warrior/heroic_strike_cleave.go
index 77d45da41b..7e8a775170 100644
--- a/sim/warrior/heroic_strike_cleave.go
+++ b/sim/warrior/heroic_strike_cleave.go
@@ -9,14 +9,14 @@ func (warrior *Warrior) registerHeroicStrikeSpell(realismICD *core.Cooldown) {
 		25: 44,
 		40: 80,
 		50: 111,
-		60: core.TernaryFloat64(core.IncludeAQ, 157, 138),
+		60: core.TernaryFloat64(warrior.Env.UseAQSpellRanks, 157, 138),
 	}[warrior.Level]
 
 	spellID := map[int32]int32{
 		25: 1608,
 		40: 11565,
 		50: 11566,
-		60: core.TernaryInt32(core.IncludeAQ, 25286, 11567),
+		60: core.TernaryInt32(warrior.Env.UseAQSpellRanks, 25286, 11567),
 	}[warrior.Level]
 
 	// No known equation
@@ -24,7 +24,7 @@ func (warrior *Warrior) registerHeroicStrikeSpell(realismICD *core.Cooldown) {
 		25: 68,  //guess
 		40: 103, //guess
 		50: 120,
-		60: core.TernaryFloat64(core.IncludeAQ, 173, 145),
+		60: core.TernaryFloat64(warrior.Env.UseAQSpellRanks, 173, 145),
 	}[warrior.Level]
 
 	warrior.HeroicStrike = warrior.RegisterSpell(AnyStance, core.SpellConfig{
diff --git a/sim/warrior/revenge.go b/sim/warrior/revenge.go
index 5ccf336c0d..b4b3c8f8dc 100644
--- a/sim/warrior/revenge.go
+++ b/sim/warrior/revenge.go
@@ -17,7 +17,7 @@ func (warrior *Warrior) registerRevengeSpell(cdTimer *core.Timer) {
 		25: 2,
 		40: 3,
 		50: 4,
-		60: core.TernaryInt(core.IncludeAQ, 6, 5),
+		60: core.TernaryInt(warrior.Env.UseAQSpellRanks, 6, 5),
 	}[warrior.Level]
 	actionID := core.ActionID{SpellID: RevengeSpellId[rank]}
 	basedamageLow := RevengeBaseDamage[rank][0]
diff --git a/sim/warrior/shouts.go b/sim/warrior/shouts.go
index 9a896d0fe4..a4e4dc4dcf 100644
--- a/sim/warrior/shouts.go
+++ b/sim/warrior/shouts.go
@@ -38,7 +38,12 @@ func (warrior *Warrior) newShoutSpellConfig(actionID core.ActionID, rank int32,
 }
 
 func (warrior *Warrior) registerBattleShout() {
-	rank := core.LevelToBuffRank[core.BattleShout][warrior.Level]
+	rank := map[int32]int32{
+		25: 3,
+		40: 4,
+		50: 5,
+		60: core.TernaryInt32(warrior.Env.UseAQSpellRanks, 7, 6),
+	}[warrior.Level]
 	actionId := core.BattleShoutSpellId[rank]
 
 	warrior.BattleShout = warrior.newShoutSpellConfig(core.ActionID{SpellID: actionId}, rank, warrior.NewPartyAuraArray(func(unit *core.Unit) *core.Aura {
diff --git a/sim/warrior/tank_warrior/TestTankWarrior.results b/sim/warrior/tank_warrior/TestTankWarrior.results
index 675eeb8ca9..2331dcbc1c 100644
--- a/sim/warrior/tank_warrior/TestTankWarrior.results
+++ b/sim/warrior/tank_warrior/TestTankWarrior.results
@@ -1,8 +1,8 @@
 character_stats_results: {
  key: "TestTankWarrior-Phase4-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 415.8
-  final_stats: 269.5
+  final_stats: 396
+  final_stats: 257.4
   final_stats: 759
   final_stats: 102.3
   final_stats: 135.3
@@ -18,21 +18,21 @@ character_stats_results: {
   final_stats: 22
   final_stats: 0
   final_stats: 0
-  final_stats: 1895.6
+  final_stats: 1807
   final_stats: 6
-  final_stats: 33.475
+  final_stats: 32.87
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 7581
+  final_stats: 7556.8
   final_stats: 814
   final_stats: 165
   final_stats: 16.6
   final_stats: 158
-  final_stats: 20.075
+  final_stats: 19.47
   final_stats: 11.6
   final_stats: 0
   final_stats: 10599
@@ -50,7 +50,7 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestTankWarrior-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.01547
+  weights: 0.84953
   weights: 0
   weights: 0
   weights: 0
@@ -67,7 +67,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.175
+  weights: 0.37277
   weights: 0
   weights: 0
   weights: 0
@@ -78,9 +78,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.53917
+  weights: 1.48408
   weights: 0
-  weights: 0.52803
+  weights: 0.53505
   weights: 0
   weights: 0
   weights: 0
@@ -99,71 +99,71 @@ stat_weights_results: {
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-AllItems-BanishedMartyr'sFullPlate"
  value: {
-  dps: 1627.91061
-  tps: 3592.61256
+  dps: 1437.90113
+  tps: 3179.68076
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-AllItems-BattlegearofHeroism"
  value: {
-  dps: 922.6751
-  tps: 1885.5839
+  dps: 798.00988
+  tps: 1613.63685
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-AllItems-BloodGuard'sPlate"
  value: {
-  dps: 930.31682
-  tps: 1937.83748
+  dps: 794.70964
+  tps: 1634.64817
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-AllItems-EmeraldDreamPlate"
  value: {
-  dps: 919.51802
-  tps: 1924.88197
+  dps: 785.61558
+  tps: 1618.68416
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-AllItems-Knight-Lieutenant'sPlate"
  value: {
-  dps: 930.31682
-  tps: 1937.83748
+  dps: 794.70964
+  tps: 1634.64817
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-AllItems-WailingBerserker'sPlateArmor"
  value: {
-  dps: 1712.37908
-  tps: 3714.84855
+  dps: 1510.69885
+  tps: 3268.98815
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 1536.9516
-  tps: 3964.69393
+  dps: 1379.18793
+  tps: 3585.88514
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 445.08433
-  tps: 1263.16714
+  dps: 430.00424
+  tps: 1230.87024
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 115.23529
-  tps: 380.02153
+  dps: 112.75603
+  tps: 373.56071
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-Settings-Human-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 171.70318
-  tps: 547.99725
+  dps: 167.93874
+  tps: 538.54264
  }
 }
 dps_results: {
@@ -190,22 +190,22 @@ dps_results: {
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 460.04462
-  tps: 1290.23871
+  dps: 441.31251
+  tps: 1251.37823
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 119.20551
-  tps: 389.52976
+  dps: 115.86462
+  tps: 381.04802
  }
 }
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-Settings-Orc-phase_4_tanky-Arms-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 179.49649
-  tps: 564.64747
+  dps: 175.22558
+  tps: 553.94155
  }
 }
 dps_results: {
@@ -232,7 +232,7 @@ dps_results: {
 dps_results: {
  key: "TestTankWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1306.3395
-  tps: 3415.73511
+  dps: 1204.92751
+  tps: 3157.20288
  }
 }
diff --git a/ui/balance_druid/sim.ts b/ui/balance_druid/sim.ts
index 0348f45555..df38862486 100644
--- a/ui/balance_druid/sim.ts
+++ b/ui/balance_druid/sim.ts
@@ -99,7 +99,11 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBalanceDruid, {
 	],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [OtherInputs.ReactionTime, OtherInputs.DistanceFromTarget],
+		inputs: [
+			OtherInputs.UseAQSpellRanks,
+			OtherInputs.ReactionTime,
+			OtherInputs.DistanceFromTarget,
+		],
 	},
 	itemSwapConfig: {
 		itemSlots: [ItemSlot.ItemSlotMainHand, ItemSlot.ItemSlotOffHand, ItemSlot.ItemSlotRanged],
diff --git a/ui/core/components/other_inputs.ts b/ui/core/components/other_inputs.ts
index 0b0f68a5b2..42ea8b6209 100644
--- a/ui/core/components/other_inputs.ts
+++ b/ui/core/components/other_inputs.ts
@@ -124,6 +124,18 @@ export const DistanceFromTarget = {
 	},
 };
 
+export const UseAQSpellRanks = {
+	id: 'use-aq-spell-ranks',
+	type: 'boolean' as const,
+	label: 'Use AQ Spell Ranks',
+	labelTooltip: 'Include ranks of spells that were added in the Ahn\'Qiraj patch.',
+	changedEvent: (player: Player<any>) => player.sim.useAQSpellsChangeEmitter,
+	getValue: (player: Player<any>) => player.sim.getUseAQSpellRanks(),
+	setValue: (eventID: EventID, player: Player<any>, newValue: boolean) => {
+		player.sim.setUseAQSpellRanks(eventID, newValue);
+	},
+};
+
 export const IsbUsingShadowflame = {
 	id: 'isb-using-shadowflame',
 	type: 'boolean' as const,
diff --git a/ui/core/sim.ts b/ui/core/sim.ts
index ea79244ce8..930a8677af 100644
--- a/ui/core/sim.ts
+++ b/ui/core/sim.ts
@@ -59,12 +59,13 @@ export enum SimSettingCategories {
 }
 
 const WASM_CONCURRENCY_STORAGE_KEY = `sod_wasmconcurrency`;
+const DEFAULT_ITERATIONS = 10_000;
 
 // Core Sim module which deals only with api types, no UI-related stuff.
 export class Sim {
 	private readonly workerPool: WorkerPool;
 
-	private iterations = 3000;
+	private iterations = DEFAULT_ITERATIONS;
 	private phase: number = OtherConstants.CURRENT_PHASE;
 	private faction: Faction = Faction.Alliance;
 	private fixedRngSeed = 0;
@@ -76,6 +77,7 @@ export class Sim {
 	private wasmConcurrency = 0;
 	private showEPValues = false;
 	private language = '';
+	private useAQSpellRanks = true;
 
 	readonly raid: Raid;
 	readonly encounter: Encounter;
@@ -95,6 +97,7 @@ export class Sim {
 	readonly wasmConcurrencyChangeEmitter = new TypedEvent<void>();
 	readonly showEPValuesChangeEmitter = new TypedEvent<void>();
 	readonly languageChangeEmitter = new TypedEvent<void>();
+	readonly useAQSpellsChangeEmitter = new TypedEvent<void>();
 	readonly crashEmitter = new TypedEvent<SimError>();
 
 	// Emits when any of the settings change (but not the raid / encounter).
@@ -163,6 +166,7 @@ export class Sim {
 			this.showExperimentalChangeEmitter,
 			this.showEPValuesChangeEmitter,
 			this.languageChangeEmitter,
+			this.useAQSpellsChangeEmitter,
 		]);
 
 		this.changeEmitter = TypedEvent.onAny([this.settingsChangeEmitter, this.raid.changeEmitter, this.encounter.changeEmitter]);
@@ -635,6 +639,16 @@ export class Sim {
 		}
 	}
 
+	getUseAQSpellRanks(): boolean {
+		return this.useAQSpellRanks;
+	}
+	setUseAQSpellRanks(eventID: EventID, newVal: boolean) {
+		if (newVal != this.useAQSpellRanks) {
+			this.useAQSpellRanks = newVal;
+			this.useAQSpellsChangeEmitter.emit(eventID);
+		}
+	}
+
 	static readonly ALL_ARMOR_TYPES = (getEnumValues(ArmorType) as Array<ArmorType>).filter(v => v != 0);
 	static readonly ALL_WEAPON_TYPES = (getEnumValues(WeaponType) as Array<WeaponType>).filter(v => v != 0);
 	static readonly ALL_RANGED_WEAPON_TYPES = (getEnumValues(RangedWeaponType) as Array<RangedWeaponType>).filter(v => v != 0);
@@ -669,6 +683,7 @@ export class Sim {
 			showExperimental: this.getShowExperimental(),
 			showEpValues: this.getShowEPValues(),
 			language: this.getLanguage(),
+			useAqSpellRanks: this.getUseAQSpellRanks(),
 			faction: this.getFaction(),
 			filters: filters,
 		});
@@ -676,7 +691,7 @@ export class Sim {
 
 	fromProto(eventID: EventID, proto: SimSettingsProto) {
 		TypedEvent.freezeAllAndDo(() => {
-			this.setIterations(eventID, proto.iterations || 3000);
+			this.setIterations(eventID, proto.iterations || DEFAULT_ITERATIONS);
 			this.setPhase(eventID, proto.phase || OtherConstants.CURRENT_PHASE);
 			this.setFixedRngSeed(eventID, Number(proto.fixedRngSeed));
 			this.setShowDamageMetrics(eventID, proto.showDamageMetrics);
@@ -685,6 +700,7 @@ export class Sim {
 			this.setShowExperimental(eventID, proto.showExperimental);
 			this.setShowEPValues(eventID, proto.showEpValues);
 			this.setLanguage(eventID, proto.language);
+			this.setUseAQSpellRanks(eventID, proto.useAqSpellRanks);
 			this.setFaction(eventID, proto.faction || Faction.Alliance);
 
 			const filters = proto.filters || Sim.defaultFilters();
@@ -711,13 +727,14 @@ export class Sim {
 		this.fromProto(
 			eventID,
 			SimSettingsProto.create({
-				iterations: 3000,
+				iterations: DEFAULT_ITERATIONS,
 				phase: OtherConstants.CURRENT_PHASE,
 				faction: Faction.Alliance,
 				showDamageMetrics: !isHealingSim,
 				showThreatMetrics: isTankSim,
 				showHealingMetrics: isHealingSim,
 				language: this.getLanguage(), // Don't change language.
+				useAqSpellRanks: true,
 				filters: Sim.defaultFilters(),
 				showEpValues: false,
 			}),
diff --git a/ui/elemental_shaman/sim.ts b/ui/elemental_shaman/sim.ts
index 5f2874d0a6..03451dbb33 100644
--- a/ui/elemental_shaman/sim.ts
+++ b/ui/elemental_shaman/sim.ts
@@ -93,7 +93,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecElementalShaman, {
 	excludeBuffDebuffInputs: [BuffDebuffInputs.BleedDebuff],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [OtherInputs.DistanceFromTarget],
+		inputs: [
+			OtherInputs.UseAQSpellRanks,
+			OtherInputs.DistanceFromTarget,
+		],
 	},
 	itemSwapConfig: {
 		itemSlots: [ItemSlot.ItemSlotMainHand, ItemSlot.ItemSlotOffHand],
diff --git a/ui/enhancement_shaman/sim.ts b/ui/enhancement_shaman/sim.ts
index 3e96971f2f..8ca46265aa 100644
--- a/ui/enhancement_shaman/sim.ts
+++ b/ui/enhancement_shaman/sim.ts
@@ -118,7 +118,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecEnhancementShaman, {
 	excludeBuffDebuffInputs: [BuffDebuffInputs.BleedDebuff],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [ShamanInputs.SyncTypeInput, OtherInputs.TankAssignment, OtherInputs.InFrontOfTarget],
+		inputs: [
+			OtherInputs.UseAQSpellRanks,
+			ShamanInputs.SyncTypeInput,
+			OtherInputs.TankAssignment,
+			OtherInputs.InFrontOfTarget,
+		],
 	},
 	itemSwapConfig: {
 		itemSlots: [ItemSlot.ItemSlotMainHand, ItemSlot.ItemSlotOffHand],
diff --git a/ui/feral_druid/sim.ts b/ui/feral_druid/sim.ts
index 1323f299de..7f7672165f 100644
--- a/ui/feral_druid/sim.ts
+++ b/ui/feral_druid/sim.ts
@@ -118,6 +118,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralDruid, {
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
 		inputs: [
+			OtherInputs.UseAQSpellRanks,
 			OtherInputs.ReactionTime,
 			// DruidInputs.AssumeBleedActive,
 			OtherInputs.TankAssignment,
diff --git a/ui/feral_tank_druid/sim.ts b/ui/feral_tank_druid/sim.ts
index 0450c93c19..48c26c0c76 100644
--- a/ui/feral_tank_druid/sim.ts
+++ b/ui/feral_tank_druid/sim.ts
@@ -116,6 +116,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralTankDruid, {
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
 		inputs: [
+			OtherInputs.UseAQSpellRanks,
 			OtherInputs.TankAssignment,
 			OtherInputs.IncomingHps,
 			OtherInputs.HealingCadence,
diff --git a/ui/hunter/sim.ts b/ui/hunter/sim.ts
index 129d65504f..4d1a0946b2 100644
--- a/ui/hunter/sim.ts
+++ b/ui/hunter/sim.ts
@@ -126,6 +126,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecHunter, {
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
 		inputs: [
+			OtherInputs.UseAQSpellRanks,
 			//HunterInputs.NewRaptorStrike,
 			HunterInputs.PetAttackSpeedInput,
 			HunterInputs.PetUptime,
diff --git a/ui/mage/sim.ts b/ui/mage/sim.ts
index 897b73b23c..5fb7295911 100644
--- a/ui/mage/sim.ts
+++ b/ui/mage/sim.ts
@@ -105,7 +105,11 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, {
 	excludeBuffDebuffInputs: [],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [OtherInputs.DistanceFromTarget, OtherInputs.TankAssignment],
+		inputs: [
+			OtherInputs.UseAQSpellRanks,
+			OtherInputs.DistanceFromTarget,
+			OtherInputs.TankAssignment,
+		],
 	},
 	encounterPicker: {
 		// Whether to include 'Execute Duration (%)' in the 'Encounter' section of the settings tab.
diff --git a/ui/protection_paladin/sim.ts b/ui/protection_paladin/sim.ts
index 3d5f1720eb..791c79a2bd 100644
--- a/ui/protection_paladin/sim.ts
+++ b/ui/protection_paladin/sim.ts
@@ -176,6 +176,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecProtectionPaladin, {
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
 		inputs: [
+			OtherInputs.UseAQSpellRanks,
 			OtherInputs.TankAssignment,
 			OtherInputs.IncomingHps,
 			OtherInputs.HealingCadence,
diff --git a/ui/retribution_paladin/sim.ts b/ui/retribution_paladin/sim.ts
index 4f223a1b80..53d021c5da 100644
--- a/ui/retribution_paladin/sim.ts
+++ b/ui/retribution_paladin/sim.ts
@@ -134,7 +134,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 	excludeBuffDebuffInputs: [],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [OtherInputs.TankAssignment, OtherInputs.InFrontOfTarget, RetributionPaladinInputs.CrusaderStrikeStopAttack, RetributionPaladinInputs.JudgementStopAttack, RetributionPaladinInputs.DivineStormStopAttack],
+		inputs: [OtherInputs.UseAQSpellRanks,
+			OtherInputs.TankAssignment,
+			OtherInputs.InFrontOfTarget,
+			RetributionPaladinInputs.CrusaderStrikeStopAttack,
+			RetributionPaladinInputs.JudgementStopAttack,
+			RetributionPaladinInputs.DivineStormStopAttack,
+		],
 	},
 	encounterPicker: {
 		// Whether to include 'Execute Duration (%)' in the 'Encounter' section of the settings tab.
diff --git a/ui/rogue/sim.ts b/ui/rogue/sim.ts
index 382bdbc6aa..0d916e2ab9 100644
--- a/ui/rogue/sim.ts
+++ b/ui/rogue/sim.ts
@@ -143,7 +143,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRogue, {
 	excludeBuffDebuffInputs: [],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [OtherInputs.TankAssignment, OtherInputs.InFrontOfTarget, HonorOfThievesCritRate, pkSwap],
+		inputs: [
+			OtherInputs.UseAQSpellRanks,
+			OtherInputs.TankAssignment,
+			OtherInputs.InFrontOfTarget,
+			HonorOfThievesCritRate,
+			pkSwap,
+		],
 	},
 	encounterPicker: {
 		// Whether to include 'Execute Duration (%)' in the 'Encounter' section of the settings tab.
diff --git a/ui/shadow_priest/sim.ts b/ui/shadow_priest/sim.ts
index 436a657b89..91adfc2b4e 100644
--- a/ui/shadow_priest/sim.ts
+++ b/ui/shadow_priest/sim.ts
@@ -106,7 +106,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecShadowPriest, {
 	excludeBuffDebuffInputs: [],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [OtherInputs.TankAssignment, OtherInputs.ChannelClipDelay, OtherInputs.DistanceFromTarget],
+		inputs: [
+			OtherInputs.UseAQSpellRanks,
+			OtherInputs.TankAssignment,
+			OtherInputs.ChannelClipDelay,
+			OtherInputs.DistanceFromTarget,
+		],
 	},
 	encounterPicker: {
 		// Whether to include 'Execute Duration (%)' in the 'Encounter' section of the settings tab.
diff --git a/ui/tank_rogue/sim.ts b/ui/tank_rogue/sim.ts
index 6518c04290..ce79914576 100644
--- a/ui/tank_rogue/sim.ts
+++ b/ui/tank_rogue/sim.ts
@@ -122,6 +122,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankRogue, {
 	excludeBuffDebuffInputs: [],
 	otherInputs: {
 		inputs: [
+			OtherInputs.UseAQSpellRanks,
 			OtherInputs.TankAssignment,
 			OtherInputs.IncomingHps,
 			OtherInputs.HealingCadence,
diff --git a/ui/tank_warlock/sim.ts b/ui/tank_warlock/sim.ts
index d4b9f57007..91925621cf 100644
--- a/ui/tank_warlock/sim.ts
+++ b/ui/tank_warlock/sim.ts
@@ -130,6 +130,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankWarlock, {
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
 		inputs: [
+			OtherInputs.UseAQSpellRanks,
 			WarlockInputs.PetPoolManaInput(),
 			OtherInputs.TankAssignment,
 			OtherInputs.IncomingHps,
diff --git a/ui/tank_warrior/sim.ts b/ui/tank_warrior/sim.ts
index a17b5be9bb..78973842a1 100644
--- a/ui/tank_warrior/sim.ts
+++ b/ui/tank_warrior/sim.ts
@@ -114,6 +114,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankWarrior, {
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
 		inputs: [
+			OtherInputs.UseAQSpellRanks,
 			WarriorInputs.StartingRage<Spec.SpecWarrior>(),
 			WarriorInputs.StanceSnapshot<Spec.SpecWarrior>(),
 			OtherInputs.InFrontOfTarget,
diff --git a/ui/warden_shaman/sim.ts b/ui/warden_shaman/sim.ts
index 8328459f0d..f01411484d 100644
--- a/ui/warden_shaman/sim.ts
+++ b/ui/warden_shaman/sim.ts
@@ -147,6 +147,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWardenShaman, {
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
 		inputs: [
+			OtherInputs.UseAQSpellRanks,
 			OtherInputs.InFrontOfTarget,
 			OtherInputs.TankAssignment,
 			OtherInputs.IncomingHps,
diff --git a/ui/warlock/sim.ts b/ui/warlock/sim.ts
index c2db7d3a3e..051ee31434 100644
--- a/ui/warlock/sim.ts
+++ b/ui/warlock/sim.ts
@@ -180,7 +180,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWarlock, {
 	petConsumeInputs: [ConsumablesInputs.PetAttackPowerConsumable, ConsumablesInputs.PetAgilityConsumable, ConsumablesInputs.PetStrengthConsumable],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [WarlockInputs.PetPoolManaInput(), OtherInputs.DistanceFromTarget, OtherInputs.ChannelClipDelay],
+		inputs: [
+			OtherInputs.UseAQSpellRanks,
+			WarlockInputs.PetPoolManaInput(),
+			OtherInputs.DistanceFromTarget,
+			OtherInputs.ChannelClipDelay,
+		],
 	},
 	itemSwapConfig: {
 		itemSlots: [ItemSlot.ItemSlotMainHand, ItemSlot.ItemSlotOffHand, ItemSlot.ItemSlotRanged],
diff --git a/ui/warrior/sim.ts b/ui/warrior/sim.ts
index 2985d4d897..c705350a4b 100644
--- a/ui/warrior/sim.ts
+++ b/ui/warrior/sim.ts
@@ -101,7 +101,12 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecWarrior, {
 	excludeBuffDebuffInputs: [],
 	// Inputs to include in the 'Other' section on the settings tab.
 	otherInputs: {
-		inputs: [WarriorInputs.StartingRage<Spec.SpecWarrior>(), WarriorInputs.StanceSnapshot<Spec.SpecWarrior>(), OtherInputs.InFrontOfTarget],
+		inputs: [
+			OtherInputs.UseAQSpellRanks,
+			WarriorInputs.StartingRage<Spec.SpecWarrior>(),
+			WarriorInputs.StanceSnapshot<Spec.SpecWarrior>(),
+			OtherInputs.InFrontOfTarget,
+		],
 	},
 	encounterPicker: {
 		// Whether to include 'Execute Duration (%)' in the 'Encounter' section of the settings tab.