diff --git a/TheWarWithin/ShamanElemental.lua b/TheWarWithin/ShamanElemental.lua
index e62ce1cb0..502b37ca0 100644
--- a/TheWarWithin/ShamanElemental.lua
+++ b/TheWarWithin/ShamanElemental.lua
@@ -1541,8 +1541,8 @@ spec:RegisterAbilities( {
 
         handler = function ()
             removeBuff( "chains_of_devastation_ch" )
-            removeBuff( "ancestral_swiftness" )
-            removeBuff( "natures_swiftness" ) -- TODO: Determine order of instant cast effect consumption.
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end -- TODO: Determine order of instant cast effect consumption.
             removeBuff( "echoing_shock" )
 
             if legendary.chains_of_devastation.enabled then
@@ -1582,8 +1582,8 @@ spec:RegisterAbilities( {
 
         handler = function ()
             removeBuff( "chains_of_devastation_cl" )
-            removeBuff( "ancestral_swiftness" )
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
             removeBuff( "master_of_the_elements" )
             removeBuff( "echoing_shock" )
             removeStack( "storm_frenzy" )
@@ -1928,8 +1928,8 @@ spec:RegisterAbilities( {
 
         handler = function ()
             removeBuff( "master_of_the_elements" )
-            removeBuff( "ancestral_swiftness" )
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
             removeBuff( "magma_chamber" )
             removeBuff( "echoing_shock" )
 
@@ -2326,8 +2326,8 @@ spec:RegisterAbilities( {
         handler = function ()
             gain( ( buff.stormkeeper.up and 3 or 2 ) * min( ( level > 42 and 5 or 3 ) + ( buff.surge_of_power.up and 1 or 0 ), true_active_enemies ), "maelstrom" )
 
-            removeBuff( "ancestral_swiftness" )
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
             removeStack( "stormkeeper" )
             removeStack( "arc_discharge" )
             removeBuff( "surge_of_power" )
@@ -2371,8 +2371,8 @@ spec:RegisterAbilities( {
         handler = function ()
             removeBuff( "windspeakers_lava_resurgence" )
             removeBuff( "lava_surge" )
-            removeBuff( "ancestral_swiftness" )
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
             removeBuff( "flux_melting" )
             removeStack( "molten_charge" )
             removeBuff( "echoing_shock" )
@@ -2457,8 +2457,8 @@ spec:RegisterAbilities( {
 
             gain( ms, "maelstrom" )
 
-            removeBuff( "ancestral_swiftness" )
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
             removeBuff( "master_of_the_elements" )
             removeBuff( "surge_of_power" )
             removeStack( "power_of_the_maelstrom" )
@@ -2529,8 +2529,8 @@ spec:RegisterAbilities( {
 
             gain( ms, "maelstrom" )
 
-            removeBuff( "ancestral_swiftness" )
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
             removeBuff( "master_of_the_elements" )
             removeBuff( "surge_of_power" )
             removeStack( "power_of_the_maelstrom" )
diff --git a/TheWarWithin/ShamanEnhancement.lua b/TheWarWithin/ShamanEnhancement.lua
index 2f0953584..6fb2d6e76 100644
--- a/TheWarWithin/ShamanEnhancement.lua
+++ b/TheWarWithin/ShamanEnhancement.lua
@@ -1321,7 +1321,8 @@ spec:RegisterAbilities( {
 
             removeStack( "arc_discharge" )
             removeBuff( "chains_of_devastation_cl" )
-            removeBuff( "natures_swiftness" ) -- TODO: Determine order of instant cast effect consumption.
+            
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end -- TODO: Determine order of instant cast effect consumption.
             removeBuff( "master_of_the_elements" )
 
             if legendary.chains_of_devastation.enabled then
@@ -1556,7 +1557,7 @@ spec:RegisterAbilities( {
         handler = function ()
             consume_maelstrom()
 
-            removeBuff( "natures_swiftness" )
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
             applyBuff( "elemental_blast" )
 
             if talent.lightning_rod.enabled then applyDebuff( "target", "lightning_rod" ) end
@@ -1987,7 +1988,7 @@ spec:RegisterAbilities( {
         handler = function ()
             consume_maelstrom()
 
-            removeBuff( "natures_swiftness" )
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
 
             if buff.primordial_wave.up and state.spec.enhancement and ( talent.splintered_elements.enabled or legendary.splintered_elements.enabled ) then
                 if buff.splintered_elements.down then stat.haste = stat.haste + 0.1 * active_dot.flame_shock end
@@ -2026,7 +2027,7 @@ spec:RegisterAbilities( {
         handler = function ()
             consume_maelstrom()
 
-            removeBuff( "natures_swiftness" )
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
             removeStack( "tempest" )
 
             if buff.primordial_wave.up and state.spec.enhancement and ( talent.splintered_elements.enabled or legendary.splintered_elements.enabled ) then
@@ -2741,4 +2742,4 @@ spec:RegisterSetting( "filler_shock", true, {
 
 
 
-spec:RegisterPack( "Enhancement", 20240921, [[Hekili:L3tAVnoow(Bjyr52ovvo2YjPs3ionW2yxGUWI5lza2Vfffz5yHswYRKCLkdc8V9LxIIhVhP8vsvzagmD3MuKV7tsM7gF3)8UBNfvNC3)iyuW5J(9XJgo(3d(Y4RU726NxLC3TRII)w0JK)L8OLK)))R8fr5XjltYRPJ9Cwr0m6AuvSUmMm(I66vv)XzN9yA9I1pmmUy5zvPlxNfvNwKhxgnVM(FhF2dzfpC2SYOhlYNNL(4I6ZsYFmnp5S4SOQQWLfZwNLuDwvCy1IOLr5dJxT6UBFyDAw9FNF3dqa9LbFHahRsIj)8LtiGs6Szj85MufF3T05(5r)o5)9hBU)20L)1M7xVIUmB(6MVkh8kYG)3P)yZ9ZtZYskjBFr83ANXvFoi4tBUN(ppx8pVqUCRktlktRF2EH)YNdMqM2)CrYM7)FJkj)Fe6tA(D3MLwvxXiGP5pMLq(3(hmEssE0dzjZU7)8UBJjlzszAeHJeLrO7dRxq2LLvHP5FViMryhkM(M77T5(hwpF(WLrjzv1LfldFkjAfzgv1eg5M7VzZ9JzZQonKr3Zj7B4dfz1SF9eYa8njjJXKJYcRwLsGGQM94UBJIP75D3(uA(mYEK(TK7Qj0Cky3m08Ks5xQImK5nbf9yaEDYYvjv1nW71c8P5Nxg9JqXqEr1PBU)coU6bLytsfKhsXJVNWxJa7HltwgLMxrap(4NU5(hJNrbUwsq7U9arKUMI6N7g1XqKPyiQcX4Lx2CFFdALXNdtcjFKyGq66hgxSoVMjNmzeFzzFC0trFlHjRuvxuUSszXj4)GoZng0sGeBlLWCXUryOR54rhaw8vSHJxev(ysv48soigLj2IHx5KTEjk0xgLolm57uilA2SQHP58vKVydNvqrjQweXqzr2SINY3ETW2fHclF5TX4bMrHRCZyJQItYNrDOmC9k2kVkHi3UU8r6cxxqerK8jfMCuz9c6KsSPgvRZNr2G8hP7(VJU7ek8SI6HZZio14M4hwNg)nY3PUreg8ckGWMMUOerTbK5k5TeFbllkNLsyDpf99efgmvNc6BjM6UutbXyjOy04rUqPoJckgQBPaS1h35JxnX(m9OpZnP4vD8JatIPr1oLbyMlghS7q5HWJW5gAPnwwTOUaglg7X)Nly)k3G1xAKmzluA8ZHjZEKRzjTJVKOSMK3S20H42UBephc7NJU8tCJx7OZToGxJHXlXc8rqmt1dHehXTVFGOb4(XGLu6Gj3PTyUl))FUlY0NQQBwTEvsjNKaPvswxI5KWO441nHVJPzA4kGsiWDj6fBVOLOy7EG44HaYP5TUF0Knu(Gw2gByjVL7BQD4pkdDRdOfU31o4YwdsvC93OFk((zjjRYEoSSG49J4JGVAklIispjBIenMHDZgYhFmQZWKYgvDf8JhiN0v9yp(QxuuhsY9BgzLuOrrFpkK6JHTc4(B7ixxOHYcRKkCl(VDQ0fG7s07UEvlXY0FTqGdXjp4NiLP485tAydRYsZjqKk3uAtUOIp)5uHTqT8kgh4rCmypCwFvdu6kThke2jb7bU5q4URv8HUpXLsfGmekFyDPy3XD4EmIGZz4Bb4oj9tK)P26raURV(o8GPlroWg(C4eQtsfCWgxnNYqDQJH7jtaJrzRwef(ur2C)bps(92PhUK4htQXta2rTasCjXMARtogK425JsO)DiWuJW(dWT93YmyPJr4gLjpuqYYsdBRtPlxkXXByDPiuPHxaWrTQJaYQevPUkO1Cc3JZpzWTH6YeCNwInmJiWquKzaVLraHfkP33HTqa82R5NEcUFJDSGf(mEHvTIj4EgSwYOQQO1z6gQAmt8uAzgL3infyVXPeMJc9h3PW2SXqHZlgsKoc0hJu5bmULNeRiHdNXKUAczrKLud6kdD2hTYbIPy4OSOQU1WXeCZ(TgLqn7mXRXvFLVqNs50cPnzbv4WxKWkuCCkdUPjbUfxK)9eELU0TP40nW5mlh24VYwrN1y1zPGEgttRO9k2wnM2e1PPAkZyE4IQEmSilBN0UIY(PwsVZ3JsfReIOsXKo3Rqyl)wvtX)2T7rDC(xuj4Qswge8RuNNP0IXCXfi5HNeAyxsbasltcZl(EeDDUqtaKvl2qPXsJ98cCpnvj11eGSAOAF2qTuCXExXVDHputGJ155jz310wUMP2wObdmgho7Fys1PPEwYk6zBgXOVp2tqw3iS4Q2XAuoTdfQsTrv(5AhQUtbxhzCZvIySSvkyRPyOKCsCL0QvqHdht)sNzGO61EFiShUIoaLER2KAlyMlJy7JL6ofvjEEwSI0RyKAB6zxTJYJE44tFpISzKfDyYpwLetZvp7HqUXgM4T94XzYXDs2XdcYtTFpeiNQHPOY4WzPvITPlI5goPnQ0lf56sEQBFK3QPvbPdFTTkpxH2XhCjusKvliagXKFu2ZqLCXyCd6UXOQuDKaIn943mjZktbeOSTvkYSEooJKNmLDwxrDiw7SHK97yXd1PrElagsnIve80mj0u5QnD5qk4xe3PrLXAXi44mWmwlUBLCInMMh)Whgx)M9bWPxro5bQvBn9H77fzXr5PX0mosYFSEbJf0uZCsmQXFJL)jVb(T2noK8g9ka7OTC75oE8TMVRDsZpS70oRJoDXwwGcqFslhwnle54kMbpCvmfWilAA1TIyO6nx7xVrJFbKFUV2OHx6(oFSwC0Nn3rHkiuytQ9On4AgCVaTocrst0rB5CMw9wvPghDaZFU7DQmobAwQBzdgz95TCIockPdfkZQVrqZt3qDzY8YKQf0VGZ4bt4UXYBR6JKjQ7GwmQzybY5mOdXqzk54nek4qoC0QjxYTtWeu9yHfYEwBYjU73gQtwhnZPXmwPO0NOgXizdddAMXQAKneuVL0QJeADa5TBbcL0N3eTseHw9XjAHlHvkZjAAGURXLJY67s0iar0WrP3)fm4wJSRaIF1r18Ftd9Zz)9D0eb)l6XpaohnLWp45mgnhTPOdUuC0FIwbBlVNy(jRPxYI5uxB3zEdgEO9BEiROyw2AcFJqOYtcJjR3LJgXmT4vYZ4WGHRqihbiuR(wf96d0sjoIxxRjAXtEIsE7YT20XTWPPkmapffGr1PP6X9TG9pRTl)k9(RuMUIpT)MwwVY1RQ3CFXCIfdIUB1qDJ3e2cjys6kDUQTZvu1odlMMA8gwhsxVmCfHfNuhgL)90SMRbe6WRRsclMpp8rcVL7U2u9SzhIYi(0jM3cxT(F9Vio5FO4hwFUy3aNQPTyiHeL4jTetugZqqbOUnG8)(khRqOtE41n3neokpuXH5qcc2y3gvUC8vQYLuAPPTKgAjznZjmHXgAXsRwnJhMwrmZKwk61l)xhwpMOOxfsP9uYrdUDK16u2DjvC26sw)q4OTYmORCy7OTunjkstnKZUOgNNfQDSDDVxV(Q8vzf1kCTA7cBAWzd8Wzdq4SbVPC2aVC2GdgNfCVEJ5SbuolwryFijkUGGzfH1liSNKNlYNHzaeEUVgwabSkDHWQ0fcJswLaUbdxYIf8XY0K5elFXlWWo759gHzbMyMz5f2p7TNGAYfYIG1LCz)mjCcQvbiHwhvE(4B)q4UKfTiji7YNvoSzu2J947U9dx71RV1dTaLzGdJz4VI8hFMrszvsjnJceMr747pZaAVEdzgsWHXm8NJ8rNzqlsbtebMx0o8EZkG2P3ooHeAymc88(F1ye0LMeqpzXIJYYG5ggZzVzjO75BhFrhKymh8QEursw8HI81vdRttkNmomyvCtGPixiJ(D4ozCgBAJzfJYAloNUfTzBTZ3(w8kU4VaFcEtdJbUhy0nxR0T8J7LIkGAtLRB6fuZOA3CAJm9D0qgphlckud(ArycTtBURMEoTNksLAmWavHyKR6hcfsxES905v7SjrqiaTW2LPX1SauBwrQCDi))iK(KDWF4oc5XVkE6oQDEtNGH7Es91IhjRXqLskUTqrubhe8wcCBqqBZ3(Dw8DSQaUQmjUy5drT1bSzjOwqOr0iQZPP0P6uzYI1f5pUobE26Nh5V9mlsj9POv5Rwz3QfPjzZ8uemT4Qz(f4hZv(h3KHHLkFr5dPahzE1VfQGyfRygfB)Gg3b0)TS1jYiZPznKwneOAyCLg9PzMvf0CqkJh0uHtbLaQcHaRuEGQx1wGQbDdvd6aQg0Dunylq1anu101GFuTVEfeHV05C3ANZkJOqG7P064fHZkIj4AvOW37Z6(MzUbhpIwy7t97UNm9B(tDOrXPV6vLgyjrcpWCbHkqk8ccfZYav6psusqfBPtCbEqdZsyA6eFofvHpuYVPZmqdye2hZWZtvI7OVCUlwtRsFv4YOYV1Sm8UypCrsuw9IHRIR5(eVAuZ6a9TnBKM8hBHi)h1RltOpvwGvHXpQl8gR7yF4SOLrpMOJyciRDMLfsQtBDhmbl91GTcqh(5tXpeaNI8zAKFqGdIUz3BpWI80zcNr4jhbkNLhBUs1e2shOAua94cmy3jtYwCYDTtdWa45jRHk1CU67AdoNk4T)uEzbap3jiiU6XLWkHG9)UE0dkuyyi07PqY1HkPVA6jRZlxN9SPzDOWVNYFcUeXTdoS(vrf6oTHqzn6Mo2XVW6wy2KbbGWW1tLpzyofgUEQmVcfQdMDQP2yUc14xH7eY(Fvqq1B8(O444SX1krIEYZyXVjIUX(SRXjYVMN7FfXx1ZIpwBWpGNfFSUdBB7q3c9oFrnGacSgzAECJWuM7Cfu2VZsLRN9Kbk69hovqFMGHmFYA(pQIfwNf9XV3D0bgogRDC)CDTh0kia(1EWZL98NOdFUt3A(U(ghIJcoERHC78rquWMK)JcoGlpSJcUvltSnqA7ua7M)dka6928T93jmeZ4okSTyRoahRD)1zEFpw7MLng5yT79m8VNhRDSCj(3YJ1U3AhVDhRDF3Dm4ZoElfRlVKu8vApUfAAgnmpJ8EFSSEDpJ8xOQYGFg5VutZc9mYhO9epGEg51pz(yNrE9dMVNZipUsTl5m0ZipMo87Xa(0Q1WrjMoRxejjtDhdQZrO6oUTeDW4TJlhrlLzloa5ejeIvIk6yIN1)r)orplQKIUKqezVD(PlxvussJFEr5M7)nXro)3OUf()wtKkjK8QILK5fTUUyzun9hieUCIuWWnF9)jnNmuWFS5()IzrInCXQeEd5jSgABk)T(8CIup6aV8c73mo2aIFvlkUxEPVwM0F4dtgn66PtgnGmYj1yf4UxZqq1NxoODL2hmGG71fhCO(yd0sMXL(ygNyJx9obcVe)QgErHFCWVVJEtCDWPC5uZdT9Gb2S4XxXPwsEXVaaTeMLSIVOZk(TMEIPFsfBWrKdYiz4(J)XGoSOwNwxGvgAoh1LVdlmNHHVOMJ3r4TllB42VS7gz4iV8ylSL2)j4hO2EicG9oSgc)Gle56PymiQ(MVd11ntDT2hntVcg0BpP9DhLvkwFfI(sGBlPwdRPeIVO(vcHNZrD57Wc72KN94DeE7YYIAj9qtgoYlp2c73sAaG6EWXuD)dUqef99G9sFhyTpA67ywsF1jTV7OSsX6F)ONEGzO8xqcl(IdyK8grDlwEjcoE0RoggCCXWatmC8XiVIXbhdFSJN4JBCq1B)GiBnGlF01tThB7uCXx7JMA7rPueVZOrTYAN)2iRzF3QAPJ23HRTJoAV2hn64rvw7DcnQvw7I3ezn7lpMKmAFf12kQO9kF0iIhtbT3feOwPmVfZ9GsdBiI0vc4(WjPKgJVtKtK94OrtpMcDVhPxTYG(kPi0TpSxF77R2n9fOc2no8d9h)rO7ziTw72l31xkzQhmi4STgcA7bMV0oqoum96336Ma2tVbNth3daxKcgTCDjHmG1XdRJ4SX6EZ4w9IxrO7STa6iKxwtkNxKLvqerFK2hYs6FrGEkPK87K0oMXPV10PX30n3tVjD0(ox3mV8cwhoxNRn7zZOtEwuD0drvj)XMVY(J(yJ6j9p14aDivED8(TTQhPxyMDfx3Z4QUjZUcC0g1tZKSUenFq4l8fqMHOtS7BK5vgdExaMv33cKBCg8oHp5UVHq3Bn4DdzMDQRpyxmpGCT7gFY5g5LpHnRUVfDLp5zYDFd7eFY1mDvtz7OUABzSMJ1MWc6F(Pcfy3xSWbd(i9Y6DQlV0dU5pB3nfp1I9sFba8KR(5293w)ZTdGOnUj3O8zVNq5Hul))nZOpL9FHUFfQj97ULyPFrr5D3EB6Y)IEJdkMNMjVgBvdLoj(40ZOaNYT0EZxHMK99ZgEEIBMn8GM3jB4zPE5P)u68P8IqACDS7b7bcEfBcI9t0B7wt9TB7(5NyxjUP(8k9YloDNymmIvdJzbPTVf4qagoGziUD7bnIAmSxCa1IvxWbKmkeyY)gzdRlelR7lAdzA8hbVfZNIDdMhCk5t6dFNLp16(kFZ0Rgn4u0BPCNaD77GRa2fHGdEzKpTfXmViTNIFjAPFf7BSV)uNkIE3irItbNUGsHF)z3oexERA1rC4lt8UI5gzN8N9N8XGgveKtR6apOOejjOM8H89tI3X3PxoAK6e4VLTud2h2AyCSpzIB(6)XM7bFHDvXo6hXFJD1Wz691r9hOTzkTozPqaa2(5NuEteNog)ZbSFR)PmI9E3npCA6H6Khkp6HG4k9Piu6uM5WVdhuPJ65u6dT7IJURBCc(6w1YCSYhpbCpe9aqIoWzA4OEKg(q7U4GOhSpe9xXd0aUwnu4shd1A4J5aoCzgl4RbmfGdtBLvHtGnl4DH9k5FcSOVLJrwRKpc((eMyFN0kCnYMSROhrY27JU6Qs2KD574r1Ep0IsvsMENPoE0nKoG9RCx2iXg)F0uDjkPK(K28nsog)GeTCozPOuhU3JvfpLugMMpFn96CDeiYmFfbJ6g1ACWrmDbLW)1tBKI1hSw9T1nBuZkHcwrHkb(GEDkvYcW6TsWUTxQ7K2ZpQMwNKMtbGxX23TfnxufEnFUl5I1835ZprZUjUMhfKj45FrIkCTc3mUhrqv954SdWLOCcoxv93x02K5hYrkrsT8e3uesWF(Q6X0tHV1P09ZItEIp5oaysv0fyyJRymfUzqvZdcfdyUw7NK38CNW)0lSlPSb02tZybNEFZ0GEq1NKyR6u6FWxSXabyjHCy4bzmjUqeXTX7Pi4DF7NfRBMmsy3f(5WAAWapKRbBb3bBrgpAhj6x1tCtVdNxYHIOmYYn8kaGQ1kofECymrXCFJXKDse(iRwbSJYxZdjfxpjTvj0)aGRyPwqiLuFRhFgGnbWB3jy21fRl8l6cO)qpUd950tXasl4WaXobs7SE6nt7F1N77ti5JwtGPFaevXURlTR2VoxkJB(O6T)W0vWB5xeLokn(5WKzpQeAO(FRbxVAqpNDb6MPtoEq5ytOKn9pcaNnwZgGzvAxWcDLEvlj6Sj3MP77XpYN9j0CAJWD16vjLIhmodXAYkr0YirPeVE56mnJBGI22OMhjBatAab4zLXrd9TTo2IYu30zow5QHSN2wsBUneFAw9HsHr8vUFvDAd9MTPA2f44n)3Pw3tkPQeGu0MxjgjXCrrD4cXlA8(RICrJK9u1xzL9MZEfhdT7whum)GtvWj7jQnj87DjX4srvvpTmkVMKK4HWS7v96dhw4lV4vSbLtY(lDQQK3og9W0l6MF8dL)y)Qs(ijV9AswsW9rSH2iamqDJrne6lA6bWQcuAnauA8EpPqzbsGhq(Sh8JC40rBravDpSb9aIBiwSarjuRYKhOh8vj4wNs3UuIb8W6sIVXHxO2LsZSva(QOk(x5xA8Teu0mzlwYmcRHiGZahfvcHUO8lg2UdOl)EL1JpTuG9R95mdun345cSzhQEkTK93hAPIHJTaII5DhmJws8ZWVIH9WE1Gb0kAFlRA95Q8om2te7OYB)OFKgbO7UszhPADojiDU6j240oqz2kZz2pKGDq(WjI40(KBtgqJQM5TdTm58Kkzalwxt5eYRoA6cwVhB(kd224hsHx7NTc99nVRGuaM7AY6Tieign2zbvQ67x9a(fdTleXDNw1U8rfQmxTNLpEPBDSjDToG4G4Uv8VbMGVIpCamy)ctDmq2CM7VdteWhUnAVf4ta6VSbMDdy6yAhJS(XlSOdgIia0I(ibgrJCWIvCnTgOoyfKXjHg2VpSUHrr)LiG50Uej6Yg3u7MSNVKUSY3YoPb5GgzIlO1aUUqCC3WRrEwFLPqy9OapaZNFpeA(1608b9qM2LMyJzExaIoNGWLSug01vqTPy(m)35Kf5BJzUWUe27qVfDK0hq1fiYpG5vpyGZot0bHw32nmTcC90jwcMDL(VBGO5Ub3sm(yTrV3bdMqPwZf5SFYKD2s4TjJslINDZkGZ23vtjeeg)rpm9scIapeT03DYSQd7s4Uc9fI9wBHZBQj8vempm7yaDgkVG6QhhV7WjHdW3GHBTd6rP5g)TtXXErGmqP88X)YlGbcoq69WY7GuyeXVYauVeApr8D3jrheP1AxGGcRxwdevAjA6RoA8V3kZlfJxoEF3TnwU1rUX3cOhYDRW2ohpovhejCLgufupy1oXhdEp4WLLJXBUpvGOx8wIeqZCNGzNtnJo(zQ5JQNYjGbrk75oMJ0G9uVeaa7w9g8fUYRqkOsigO68Wkx)CNzeC7O8KEea5yBBw1oFgb6eRqS2ankE)OLYZ7P9nj8g7XKx2oicMPrgf9Ydmy3OUUZPG1sOvJrS)ofK4ENlR29eBbzJjwUIYE2SbBgJPqOmgbkAbjcFqsu2LoYX0hkdWmoHZ7zkRaifCkHYHHYkuoiyWIhoNk6nWw4AW(4YWphnFVilMDVJiWts(J1liulEJ(jrse)nwxs4PaYLwoWKXTQEV(w)JTHQ9a0G2GFwkpq7kH2RNEUKrV2Nmke59qudIwLr)X6VtLH4MP6jrcS1hIS9BXJ9pHFBcm0(SFP9dUo)kN5)2iiPL8VBt62jpx3L0)7MTc357TJzWdK5KBK1PgHRqP8JK7k7j4xYqqCe55BHRCeWzB8wZY78nZHmmc4TIeyMIrlkb7pIA39)p]] )
+spec:RegisterPack( "Enhancement", 20240927, [[Hekili:L3tAVnoow(Bjyq52oPAhB54uPBeNgyBSlqxyX8Lma73IIISCSqjl5vsoPYGa)BF4HefpEps5dLuvAGbt3Dif57(KK(UX39VU725bLr39p9g5DXOFZ7ldhp9cVrtV72YxwhD3TRdc)wWJK)L0GvK)))70LbPHrRIslPJ9sswWC6AuKTjpKm(YYY1f)(5N)yC5YnpmmmB15fXR2KeugNLgMhSOK(FhE(djzpC(88GhZsxKe)4YYZJsFmon68WKGIc)vzZ3KevCErOFXYGvbPddxV(UBFytCs5FLE3dqa94PxrGJ1rHK)8LtiGs885r85gveE3T05(RJ(nY)733E)TXR(ZT3VznDz2(1TFvm4vKb)FI)(27xeNKeLt2(SWV1mJR(vpVpV9E6)8IQ)5uXYTopolpU8fZf(l)Q3eY0(xlJ2E))xqo5)JqFItV72K4IYcgbmo9XKiY)2)KXtIsdEijA(D)x3DBizjJYJdiCKGecDFy5sYUSQWpo9PSqgHDy103EFVT3)WMflgUkikPOmpBL)ZrbRjZOOKWi3E)neyMnRYyFgDpLSV(pKLuY(RNqgGVjrjmMCqIFX6yceuuVh3DBqiDpV72NJtNt2J4VfDxjHMJc2KfDEw5Wfjejio9CyzC43iBmhs4B4kcmeL6t4(bBskvWO(BVppiEUF0t0jgmFEXW4ugUWbLHec)QS85XeO95GNIiIDzjZZEMmNxFf(BVE79xU9(bniJ2sqXOjumQE8fr5cAHmEsM3fOyoJvugTADurznh46kou9FEvW39RgYjZB227NktZqzsSjjdYdP4Xtr81WZC48OvbXPfeWJp(PBV)XW5uGRHe0SBpquslPO(u7OogImddrLiguoxFnAL2NdtcjFu1a(013pmBtAjtAzYi(YY(4GNd(wet6VOmlFvH0ItW)bTMBijdvTTucZLDhH5Gz)xwtMcxgK)yuH)ICogeKWNW4HxjtOkcJsNtT6pCZAf8fqG4lVpgVWmkDLD2GgQrw51rePSn5psx4Ymcdvq5Ki7b5LlPtkY0MyXM05Kni9r6U)B2mjcycKqexs3yMLsadUswqPl)4rDQqgBo6wwRit1mZkfqdivJ7qbwC3Ao1Y(cOk2yCpooxXJHv0l08yIsmautgpz)H9VyhSMwRDZwO4Wx8JM)iNXjuPR81wT2mTA2xv73CiSVb6YpXoE5Wx4bGxJHXRQf4mqmtA1hlWrBg9ok0aCNIWskTWW3Sgm3Mw7V2gz6t5Ui5ZRyZ6OCojPzgN1mCjXeDOFqy4M6G4BM2GAs6jOglSAryp9r2iKJydN4DGGrXPn(iueDK(GgUk3FynRN7aPz4ZerdD4ynUhYwe8TcImpJsBO(7eA3vF)8OO1jV4NNr8Grc9LVAslsvSvcMmj(hM4RPejFmQdTO8AdfsraWdDs4UDSd)TlZk9j5poVMt1cJNjbpf4tDmYwFCpQTuKPmM4bTmZNQ0uzjGhZRG)2oWcqV3BpDhtbURC6XfjbiWpri3YfwQfulwNeNsGizrcHBHSc(8xqLy9vshySNcp3uM27a8TFvnuAlBfke2kTJbhc)ZAgShJWxPsHAs2pSjVA3XJiOlY91AIVEhGx8PTjOPkIPKLyn7BoZmzVJd4cDtyqsc4EW7BXrSQu9atZSw8L2kzhjNpG69C2Ut6RlDdafCCx1GcNZesNs(OAem71gv5dgnA2Agk4oZuGOYQ51koUuzRwQBvRqYtATx7EM1rtXo9eDrBfFNE4(MBfCECI6WclTRckXZrqdKqftyFsTR2kdleAmpmq1CElEoopHQCiuvBHuPDXzPm8ZZkkBYWFYbesXUyi2fN7hbJYtWdY4hEJY2STobpSJAbMK1ld8FolzHcObYAj)9MP7VIKeKWebbyh1aiH5e7cnziXGe8qq0QxvlcWsRwvtWdPOHzWk4gHBKh9q2gIXwfLhAG7fXeTg)Y8Q0WhofGJAuxxKvjOqEvWkG4eRHc8JeCRz1BcUl7QnmHiWqu6zaVHUEL7BHhKHnqa82R4RzcUZ2okEbm3(t2bVEwCHBXCUB))TW6ks)XWiV4E02fKc3twZ(24gKUXxG7pAx249JAUB0OlCKt6BHxFu)6xypvtDetZw6f42PRvTD0ibvkfUP5tGilOchoAgOmfhNY40Svyw6tr8g0OAO0QVTlywKmXFPTIoRRKNLe6PnTFtEAsomuN20rYtt2(S28WfvDyTu0TjHXsP9tUtutpKEL0SMsDFzQtHWg(TSMI7TB)dLA6fYeCzjlnc(u55PlTOnxCbsEmx(A2LKaG48i)0SNcyRJIaiRfI(cJL67jUtRIOYscqwmu(4PGAPy6bxV09HpusGJnPPrj3vFAwQNAtQpAymU4PuuwhsP3yDoEGulWmnJO1DuZjiA0cAWI7h1EggWJCAiCZ1OeTJXrGa(SnynuEyLc2AwnuukjyzAz3PWHLPFP10QK9AFie2EhTsKdvUvLj10cjRgX2pHiPwC0MQ5GxxajJuMjH707my)epE8PNciBgzrhg991rH0WPtEWNBSHjEBoEyIyCRKD8mwC0S0JbYjBykip0FECr120gXCnN0A9(KIC4(tAvDmTD69SOYFTPkpxH2YhCjuMXfljagXKFqYlqLduBCn6U2OYuDKaI1DAwpj9oLaeOmuVGdFjmHK8pLDwwqDiwA9O70VLT6sLg5S2TIMDsOlkn)ui4PysOUQQBBZjHZTiUvJkJvIrWYbTKFIFQNOuI(AtZHF4JJRF9wFB1RiN8av(Z6AJ(uwsyqACinJJO0hlxYyb1D4LeJA43y5FYp3zn2noM8g1osA5CSCG7y3BnFFpBjUHDR2zTC4oyllqVtoPHdlNfcqJMoILbgWilAA1nIyO6nx7wVrHFbKFURtocExNA9PX0YHhXEuOvekSj10nfBZG7fOXrisAIwoejwtRENQuJLZRH7C3BvzC8uSu3Wg0Y6ZzneSeuslkuMX5yaAEQgQZJwKhvSK(fCgpyc31wEBuFemrvh0vJQhwGyodArmu6soodHcoKdlhQbBYTtWeuDyHfYEwVwwsCuNSUBIpBBTAeJKnmmOPhRQw2qagT8ukxiADa9ukxiEDaNOuVq0QporjCjSszorrd0EnUS04pBIgEiIg2713pBb3QLDfuNPT2JW3Vq)0GC1O7S0Fq3lA3haNLoi6g8SgJMLoc2cxkwA9wJGTH3tm)KL07M4cQRT70V4Fp08npKKLnpzdHVriuPr(HK17YrJyMwCk5PD8OXvieJaeQvFJIE9jAPehvDUJuIN8eP82bp3wntqbgGNIeWi70u(I7LX(NLMLFLETpZJxZN2FrlRx(M1LBVpBbXIbr3TyOQXBcBHemjDLu6JWAQANMftDnEnRdXBw5VMWIJk9dsFkoP(2ZIo8MIi)Sfl8FKWB5UR1vpR3HGeIpDI5n)1B(3)BIt(hY(UXNxTBGtv3wmKqIu8KgIjsJPjOau3g0J3z9bTh6S4FD9fqKJYdLCyoKGG12TrLlhFLSCjLwQBlPMwswZuctySMwSWQv94(XfeZmX5v96L)xhwoMOOx4tP9uYrnU1XADs7UGkoFtoRFiC0wAg0v2Vz0gQMafPPgYzxuJZZ9vUNl23R3Ev(IKSsjUwPzHn14SEo4SEiCwV3voRNtoR3rJZcUxVZCwpkNfRiSpefeMLsVchLljSNOxYsNJzaeEUVfwabSknTYQ00kJsgLaUgdxXIf8X84OfelFHlXWoZ59oHzE6yME5fom7TNGAYfYIGXTc9WmjCcQvbiHwlvEU7TFu5UKfTiji78xKobDu2J547V9dB71BV1dLaLzGdJz4UI8DpZikVikNMrbcZOz8dNzaTxVJmdb4WygUZrUZzg0IuWerG5fndFWScOD69JtiGggJapV)3mgbDPjb0twSWGKeyUH2Coywc6E((XxubjgZbVQhfKKfFilDtXWY4O8jJ99whwhykYfeSFlUJGNZM2ywXOm2IlOBrt2w777OJLE74UaFv8MAgdCpWOBUsPB533Fjva5Mkxw3lO6rvEWp0Y03sdzCCSiOqn4JSKo0oR(XnWXP9usQuHb6jleJC53rOqQYJnNoVsRnjccbOf2opoSKfGA9ksLR95)h(0x6k(7DLpp(1Qx8QsR38wy4UNqFn7rYAmuQKI7kueKXbbNLa3eeu28DFNR(owvaxNhfMT6HGM6awVeuli0iAQQZPU0P8uzYILzPpUjcE2kpOvfF7fwKsQtrPYxnYUflJJsM7OiykXvZ8lWpMR8pUodddv(S8hIboY8YFlubXYwZmk28b1UdO)BjBIerMtZAiUyiq1W4knQttpRkO5GugpOPcNckbuRecms5bQEv7aQ61ou1RfOQx7rvVDav9uqvDxdUr1(Qvqe(vAH7w7cwzeRe4EoUmCP)8SqcUw4x579fvFZm3GJhrlS9PUD3tM(n)Hk0i50x(XdbyjrcpqFbHkqk8ccfZYaz6psusqfBPvCbEqdZJyA6eFozf(pKxFhPpfCe2hZWZtLI7OVyUl3qRsFH)QG8VvVm8UypCzuqs5YHRdl5(eVAu96a9T1BKI8hBHi)hLBYJOVWKGvHXnQx5nw1X(W5bRcEmsfXQGSMzMNjOon1DqhSuxd2kaD4Npf)qaCkYNPq(bboi6MzV9alYtRjCAHN0buodp2CLQjSL2t2Oa6XfyW(tMeT4K7ANgGbWR6znvQ(C132gCoRI3(d5Lfa8CNGG4YhxcJeco876rpOqHHHqNNcjBhQK(YPNSjnFtYl6M1Hc)MgYCtBtbhw9(1cDN2qOSADth74xyClmRZGaqy46k4TNdHHRNjYRqI6GzNAMjMlrn(z4oHC4xfeu9gNVIC2FWCRMe6jpJf)wv0nMNDnor(T8C)lj(kFw8XAd(r8S4J1DytBhQwO37lQbeqG1it9JBeMYCRRGYHDwQS9iDnqsV)4Pc6YemK5Z6hdhysnwNfDXV3F0bgogRCC)SDThukia(1EWXD89hOdFUv3AUU(ghJJcoERHS78PIOGnj3hfCaxEyhfCJwMyAG00Pa2n)hua05T5B3VtyiMXTuy7QT6iCS2DxN5d9yTRx2yKJ1UZZW)bES2XYL4VLhRDN1oE3ow7UU7yWND8gkMRh7fr(uhYTqtXOH(zKh32MlFP16ch1ZiVYBTa(zK)sfnl0ZiVNYZOa6zKx9K5JDg5vpy(ooJ84k12KZqpJ8y6WFed4tPwdDsmDgpIAcM6EguNLq1B1ZKgQXBlxoIgkZoCaYjsieRef0XQ)1WzmrpliNIUKqez)KZeVADwojn(fz5BV)xQoY5)c1TW))gIujHKxKTImVGnLzRckP)bcHlLifmC7x)FJtjd597BV)pzwKydNToI3qEcRH2MYFPppNi5JoWRVY(BAhBGQ)QsuCV(AFLmP)0NMmA01ZMmAazKtkXkWDV6HGQpVyqZkTpyab3lZo6qDxd0cMXLUygNyIx9obcVQ(Rk4ff(Xb)(w6nX1ENYLt1p02dgyYIhFfNAj4f)ea0cywWk(IkR4xQ7jM6jvSghroiJKH7p(7dAXIACADbwzO50PlFlwyoddFr1hVLWBBww)DFz3pYqhV8ylSH2)j4hO2EicG9oUgc)Kne56zymiQ(MRd11nZST2DMP3kg07pP9dhLviwFfI(INDlPgdROeIVOUvcHNtNU8TyHTBYZC8wcVTzzrTKESjdD8YJTWUTK6bOU71LQ7FYgIiPV7Dq67aRDNPVJzj9nN0(HJYkeR)Top9a9q5NsclE6rmsETOURwEbcoE0Bog61TyONogoUlYRySxx4JD8exCJJQE7NQYwd4YhD9mZX2nfx81UZuB7Ksr8bJg1iRDX7JSM5DRQHoAEhU2n6O5A3z0Xovw7dcnQrwB67ISM5LhtqgnVIA7ev0CL7mIyxkO9HGa1iL5SyUhvAynrKUsa3hobLuB89ICIShDgnTlf6(isVAKbDvsrOBFyV(M3xTB6xHky34Wp1F8zq3ZqAT2nxURVuWupAqW57me00dmxPDGCOy61VVXnbSNAdoNnUhaUiemA46ccPhRJhghXzT19MXn6fVHq357a0riVSMuUiljjJiI(iTpK50FMJEokN83jPDmNtFlPtJVPBVNEt6O9DUSEEPzSoCUjvz2ZNtN88GYGhckI(9TFL9RKCT6j5)8RaDivCD8(LDQhPt1ZUIR7PDv3ezxboAT6PEswxIMpi8f(ciZq0j2(ns)kJbVlaZQ9BbYnodENWNC73qO7Tg8UHmZw11hSlMhqU2TJpzDJCYNWMv73I2YNCm52VHTIpzBM2QPSzuxnTmwXXADyb9V40kfy7xSWbdoJEz9o1Mx6b38hn7MKN6Q9sDba8Kl)5M93w9ZndGOjUj7O85FKq5Hul))fZOpL9pv1Vc1K(D3sS0Vml)UBVnE1FsVXbzlItexJTIHcNeNn7CkWjDlT3(vOjzE)SHNx1nZgEq97Kn8SKV80FoEXmEri1Uo29G9abVI1bX(z6TDRU(2nD)8ZSRe3mxELE9vRUt0ggXQH2SG023bCWddhWme3S9Ggr1g2joGAXQn4asgfvyYFJSH1gILX9fTMmn(mWBX8Py3G5bNs(K(W3z5tnUVY3m7Qrdof9wk3kq38o4wb7vHGdEzKpTbX0ViTNIFjAPFf7BmV)uNwf9UwIeNco9kkf(9ND3qCXTQvfXHVmX7lMRLDYF0FYzE1QiiNw1boqrbssqnXd57NREhFND5OrYtG)w2snyFCRHrxFYe3(1)X27bFHDLXo6hXFJDvWz691r(pqBZuCz0Qkbay7NFw6nrC2y8phW(T6NYi2hC38WPPhRtEO4OhcIR0NIqHtzMd)wCqL60ZP0NA2flDxx7e81UQLzzL7obCheDpqIoWzAOtpsdFQzxSq09oeI(B4bAaxRgkCPUqTg(yoGdx6Xc(watE4W0ozv4eyZcoxyNs(Nal6B4yK1k5oW3xLj2piTcxHSj6kAhs2(y0vxzYMOlFDhv7JqlkLjzQDMQ7OBiDa7N5USrIn(FuxDjkPK(K28nsogFNeTCkzPOuhU3J1zphL7hNUyd96C1bezMVcVrTJAn2Rdtxqk8F10gPy9rRvF7CZgvSsiHvuOQcFqVoLszby8wjy22l5Ds55hvrRtqZPaWBy772HMlkdV6p3LCXA(785NPz3ewYJcsh8CVibz2wHBg3JiOk)CC2c4QQCcwxv13x0MK5hYrQQKA5jUjjKG)8v1JPNcFRtVzupto5jUK7aGjaDQtWKEQwE4xKaqTohkDUuTAatznmGH1Uj0uSGr8QF3Qy0SRv(tIliVvY8SPMv(wJO2tXMgxS4MzE9GkJkXK6P0FxAmXGkWsa5WWdYycCHOjAI3ZqW7(MVEx3mzuL7b4xTRzEdCqUGyEyCN9dh3tgYL96xDB19xKZbXGeIRRHxvJXYUoHqJow9fyhfVAicsMAYGRJO)qJl5rOcBfKiJh5givRgnDM2VM2o8RedW6OInhktMnUzzLRHk9hKU9vH6MzF5Gfy3FJeximz7gF2vy6lWB50QYifh(IF08hLctu93DqIkqpRDe6Mzt6oOCSouYM(zaWz16mMaTWA37dwykkdZMSBlSVdz8F1LqZP1rjwSzDuE1Jhx1yNvpujXOtijILWnR2KOyaAWGQ6cb82h2gC2HipG9iGOanslPMW3uS7QAzx3(ownT3fixQG4CdyU0f5WKwcq15Gy9n5PjWD2MYKXvfg4)DQn7OCQseKJeXBmJGkVmR0FjVtIDOjbIzQyIP(YmFP3ULRNv9atUdB8okRCfQ1CGqgbNALSrVQsIc)mBsSJLvu0tjr2Rj5ME4HKqrH(WH596RoL3gSluwXp8QYIY7zqgZM2Ua(pwbUFeOZtXCuwIwAb8W62rFixaRSAiR3hXWETOYazReOwNDfh9ayLgk13cXO1cAnw)qKaQt5xYmzn33D0ohbauXijI73(6gpBO8ijP6eYpPv(b6PNISWCZeqHinxuoHIdXdfkT)448s6rLQX9L0dIyVkLoPhHXAQEXZX5SFDQfs9oelWLJEdm14qc4VFMDaGsT3bpjzBGcBcqU7b)4VoB0oKNA7DUQMaFnXIL4mHALh9a9cb0i7rJvI8Tej5YCsEcdNkF6n0lpcWxfuW)k32dEpbfi7Sjewdr0Nboss8vEeeFXWMDaD57u)mTeDA(Ee3biMDS7dzh9qu)GOBcYn2k3fyg3y67dvP947BPhK2BhPLuTwxomvU6jM40Eqz2jlWMVjSTq(WkIy1KQDRCqJkxCtlggeZtyxayXAB1(GYicTApgpTMUAvWU46uIx7MTc991prSuaM7n14zLfiij2X6xO67w9a(XFUneX9Nw1S8bzYmxLxyvEx4SSjUkXCDGA4G4(1GKb6GVuyhayqTDR9lf)ra1CtF)TyIa(CktBtmFcq)i1O3y3zJPn)34po1GoOjIaql6JelhnyhdwX1KnUNfwbzCs0S97dRBO1)wbcOpTlrciU2n1(j75Qqwg1WYSGlIbz1l1Gwd46cRVTvdJ8cTlsO049DFaMp)Ei08RvP5d6HmTl1Xg9Awbi64UEXvkdQ6kO2u0)fBP1fAJVn6jJAtyhn82My8TuPGQ0qNjvsxI8dyTkhmWA3BBHqRD7g6wbOvdzFP)7hiQVBWhBa(ynjC0cdMS9vREmCroZx)ERNUNDjjydINz)GHlrKT((wryCh9WSljic8q0QK0kZQwSlH7k0vi27SfoNPMWxrW8WmJb0AO8vux144ThojCa(AmCJDqnkn74VzkoMlcKbkPFjqE9vWabhi8Ey4DqimI4xzaQxcLFTpAVtIwisR0T3kkSALyquPfOPRIVY)EJmVKmEz5NQdtJL7CKB8Ta63KdJW2UapovlejCLgufuhy1EXh9(i4WLLJX7UpvGOxCwIeqZCNGzNtoJo(XJ8m5dSkWGivQDpZrAWbQxcaGTREdUcx5nifubed0qbyLRFSZmcUf)ospcGCS7DlYPLb42j1kwr1AdCoFomAP4O7BEPWVXCmX9MgIGPBKrsV8id21QR7DkyneA5yeD0z4UkxwLR87sYgtSCfK8IERx1gtIqPncu0cce(OKOSnDKU0hkdW0USkhykRaifCkHIHHYkumiyWIhpNkQh(NkxdMTmM3l5NYsczxHuc8eL(y5sc1IF4Pirse(nwxs4PaYLwoYKXDQEVUw)U2q1baAqBWpkLhOzLq71tpBYOx7sgfI8EmQbrJYO7y93RYqCZm1Kib26Jr2(n4XHNWVjbgAFoS0(bxNFMZ8FxeKus(3UjDZKNlBt6)TZwH9892Zm4bYCYoYAvJWwOuUrY9L949tziiwI889Wvoc4SlERz5D(U5qggbCwrcmtXOfLG97H5D)N]] )
diff --git a/TheWarWithin/ShamanRestoration.lua b/TheWarWithin/ShamanRestoration.lua
index f28af72de..b2ef03dca 100644
--- a/TheWarWithin/ShamanRestoration.lua
+++ b/TheWarWithin/ShamanRestoration.lua
@@ -452,7 +452,8 @@ spec:RegisterAbilities( {
         texture = 136015,
 
         handler = function ()
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
         end,
     },
 
@@ -820,7 +821,8 @@ spec:RegisterAbilities( {
         texture = 136048,
 
         handler = function ()
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
         end,
     },
 
@@ -1050,7 +1052,8 @@ spec:RegisterAbilities( {
         texture = 893778,
 
         handler = function ()
-            removeBuff( "natures_swiftness" )
+            if buff.ancestral_swiftness.up then removeBuff( "ancestral_swiftness" ) end
+            if buff.natures_swiftness.up then removeBuff( "natures_swiftness" ) end
         end,
     },
 } )