diff --git a/src/Databases/ItemDB.json b/src/Databases/ItemDB.json
index 15977b62e..4ecc34e0d 100644
--- a/src/Databases/ItemDB.json
+++ b/src/Databases/ItemDB.json
@@ -69678,6 +69678,23 @@
         "faction": "horde",
         "slot": "Back"
     },
+    {
+        "id": 171534,
+        "name": "Suffering's End",
+        "icon": "inv_mace_103",
+        "quality": 4,
+        "itemClass": 2,
+        "itemSubClass": 4,
+        "itemLevel": 60,
+        "stats": {
+            "intellect": 30629,
+            "stamina": 7889,
+            "haste": 4250,
+            "crit": 2750
+        },
+        "faction": "horde",
+        "slot": "1H Weapon"
+    },
     {
         "id": 171539,
         "name": "Lurid Manifestation",
@@ -69894,6 +69911,23 @@
         "faction": "horde",
         "slot": "Shield"
     },
+    {
+        "id": 171602,
+        "name": "Helm of the Crypt Lord",
+        "icon": "inv_helmet_100",
+        "quality": 4,
+        "itemClass": 4,
+        "itemSubClass": 3,
+        "itemLevel": 60,
+        "stats": {
+            "intellect": 5259,
+            "stamina": 7889,
+            "haste": 3350,
+            "crit": 3650
+        },
+        "faction": "horde",
+        "slot": "Head"
+    },
     {
         "id": 171605,
         "name": "Perdition",
@@ -69928,6 +69962,23 @@
         "faction": "horde",
         "slot": "Legs"
     },
+    {
+        "id": 171614,
+        "name": "Belt of the Eternal",
+        "icon": "inv_belt_52",
+        "quality": 4,
+        "itemClass": 4,
+        "itemSubClass": 1,
+        "itemLevel": 60,
+        "stats": {
+            "intellect": 5259,
+            "stamina": 7889,
+            "versatility": 3800,
+            "crit": 3200
+        },
+        "faction": "horde",
+        "slot": "Waist"
+    },
     {
         "id": 171615,
         "name": "Aegis of the Coliseum",
@@ -224758,6 +224809,7 @@
             "intellect": 6666,
             "stamina": 0
         },
+        "squishEra": 2,
         "slot": "Trinket",
         "effect": {
             "type": "trinket",
@@ -224927,6 +224979,7 @@
             "intellect": 6666,
             "stamina": 0
         },
+        "squishEra": 2,
         "slot": "Trinket",
         "effect": {
             "type": "trinket",
@@ -224945,6 +224998,7 @@
             "intellect": 6666,
             "stamina": 0
         },
+        "squishEra": 2,
         "slot": "Trinket",
         "effect": {
             "type": "trinket",
@@ -224963,6 +225017,7 @@
             "intellect": 6666,
             "stamina": 0
         },
+        "squishEra": 2,
         "slot": "Trinket",
         "effect": {
             "type": "trinket",
diff --git a/src/Databases/ItemNameDB.ts b/src/Databases/ItemNameDB.ts
index abb3efc0c..741ba90e7 100644
--- a/src/Databases/ItemNameDB.ts
+++ b/src/Databases/ItemNameDB.ts
@@ -32072,6 +32072,16 @@ export const nameDB =
         "fr": "Puissance des nérubiens",
         "de": "Macht der Neruber"
     },
+    "171534": {
+        "cn": "",
+        "en": "Suffering's End",
+        "ru": "Конец страданий",
+        "es": "Fin del sufrimiento",
+        "br": "Fim do Sofrimento",
+        "kr": "",
+        "fr": "Fin de la souffrance",
+        "de": "Ende des Leides"
+    },
     "171539": {
         "cn": "",
         "en": "Lurid Manifestation",
@@ -32202,6 +32212,16 @@ export const nameDB =
         "fr": "Orgueil des kor’krons",
         "de": "Stolz der Kor'kron"
     },
+    "171602": {
+        "cn": "",
+        "en": "Helm of the Crypt Lord",
+        "ru": "Шлем владыки склепа",
+        "es": "Yelmo del Señor de la cripta",
+        "br": "Elmo do Senhor da Cripta",
+        "kr": "",
+        "fr": "Heaume du seigneur des cryptes",
+        "de": "Helm des Gruftlords"
+    },
     "171605": {
         "cn": "",
         "en": "Perdition",
@@ -32222,6 +32242,16 @@ export const nameDB =
         "fr": "Garde-jambes de marche-soleil",
         "de": "Beinschützer des Sonnenläufers"
     },
+    "171614": {
+        "cn": "",
+        "en": "Belt of the Eternal",
+        "ru": "Пояс Вечного",
+        "es": "Cinturón del eterno",
+        "br": "Cinto do Eterno",
+        "kr": "",
+        "fr": "Ceinture de l’éternel",
+        "de": "Gürtel des Ewigen"
+    },
     "171615": {
         "cn": "",
         "en": "Aegis of the Coliseum",
diff --git a/src/General/Modules/Player/ClassDefaults/MistweaverMonk/MonkDefaults.js b/src/General/Modules/Player/ClassDefaults/MistweaverMonk/MonkDefaults.js
index c9f06a1ba..c9390a389 100644
--- a/src/General/Modules/Player/ClassDefaults/MistweaverMonk/MonkDefaults.js
+++ b/src/General/Modules/Player/ClassDefaults/MistweaverMonk/MonkDefaults.js
@@ -68,8 +68,8 @@ export const monkDefaultStatWeights = (contentType) => {
   statWeights.Raid = {
     intellect: 1,
     haste: 0.76,
-    crit: 0.46,
-    mastery: 0.24,
+    crit: 0.56,
+    mastery: 0.27,
     versatility: 0.53,
     leech: 0.25,
   };
diff --git a/src/General/Modules/Player/ClassDefaults/RestoShaman/RestoShamanProfile.ts b/src/General/Modules/Player/ClassDefaults/RestoShaman/RestoShamanProfile.ts
index c28b595d7..d4d0d4044 100644
--- a/src/General/Modules/Player/ClassDefaults/RestoShaman/RestoShamanProfile.ts
+++ b/src/General/Modules/Player/ClassDefaults/RestoShaman/RestoShamanProfile.ts
@@ -308,6 +308,7 @@ export function scoreShamanSet(stats: Stats, playerData: any, settings: PlayerSe
 
     // Max mana
     let manaPool = 250000 * (stats.manaPerc || 1);
+    const resurgenceManaPool = manaPool
     const innervateCount = getSetting(settings, "innervateCountShaman")
     manaPool += (manaPool * (0.25 * innervateCount))
     if (hasTalent(talents, "Primordial Capacity")){
@@ -336,7 +337,7 @@ export function scoreShamanSet(stats: Stats, playerData: any, settings: PlayerSe
         Object.keys(resurgenceManaReturns).forEach(spellName => {
             if (spellDB[spellName]){
                 // First figure out the real mana return because it is based on max mana
-                const realResurgenceReturn = manaPool * resurgenceManaReturns[spellName] / 250000
+                const realResurgenceReturn = resurgenceManaPool * resurgenceManaReturns[spellName] / 250000
                 // Every hit can proc resurgence so for Chains we need to see how many they hit
                 const spellTargets = spellDB[spellName][0].targets || 1
                 const spellCrit = getRealCrit(spellName, state, spellDB)
@@ -348,7 +349,7 @@ export function scoreShamanSet(stats: Stats, playerData: any, settings: PlayerSe
                 // Currently just handling it by hand. Some of these casts are actually from swiftness but they are also free so this includes them correctly.
                 if (spellName === "Chain Heal"){
                     const livelyTotemsChainHeals = getCPM(castProfile, "Chain Heal")
-                    const livelyTotemsManaReturn = manaPool * (manaRestored / 100) * livelyTotemsChainHeals
+                    const livelyTotemsManaReturn = resurgenceManaPool * (manaRestored / 100) * livelyTotemsChainHeals
                     manaAvailable += livelyTotemsManaReturn
                 }
             }
diff --git a/src/General/Modules/Player/ClassDefaults/RestoShaman/RestoShamanSpellDB.json b/src/General/Modules/Player/ClassDefaults/RestoShaman/RestoShamanSpellDB.json
index b35e4c6a6..189d20dea 100644
--- a/src/General/Modules/Player/ClassDefaults/RestoShaman/RestoShamanSpellDB.json
+++ b/src/General/Modules/Player/ClassDefaults/RestoShaman/RestoShamanSpellDB.json
@@ -622,7 +622,7 @@
             "castTime": 0.0,
             "school": "nature",
             "cost": 0.0,
-            "targets": 3,
+            "targets": 5,
             "targetScript": "Chain Heal",
             "coeff": 2.475,
             "aura": 1.15,
@@ -634,7 +634,7 @@
             ],
             "spellType": "heal",
             "specialFields": {
-                "chainHealFalloff": 0.3
+                "chainHealFalloff": 0.1
             }
         }
     ],