diff --git a/res/cardsfolder/w/winds_of_change.txt b/res/cardsfolder/w/winds_of_change.txt
index 796dd2498fb..03c04eeb684 100644
--- a/res/cardsfolder/w/winds_of_change.txt
+++ b/res/cardsfolder/w/winds_of_change.txt
@@ -2,13 +2,12 @@ Name:Winds of Change
 ManaCost:R
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZoneAll | Cost$ R | Defined$ You | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | RememberChanged$ True | ForgetOtherRemembered$ True | Shuffle$ True | SubAbility$ WindDraw | SpellDescription$ Each player shuffles the cards from his or her hand into his or her library, then draws that many cards.
-SVar:WindDraw:DB$Draw | NumCards$ X | Defined$ You | SubAbility$ CleanTheWind
-SVar:CleanTheWind:DB$Cleanup | ClearRemembered$ True | SubAbility$ WindOpp
-SVar:WindOpp:DB$ ChangeZoneAll | Defined$ Opponent | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | RememberChanged$ True | ForgetOtherRemembered$ True | Shuffle$ True | SubAbility$ WindDrawOpp
-SVar:WindDrawOpp:DB$Draw | NumCards$ X | Defined$ Opponent | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Amount
+A:SP$ RepeatEach | Cost$ R | RepeatPlayers$ Player | RepeatSubAbility$ ShuffleHand | SpellDescription$ Each player shuffles the cards from his or her hand into his or her library, then draws that many cards.
+SVar:ShuffleHand:DB$ ChangeZoneAll | Defined$ Player.IsRemembered | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | RememberChanged$ True | Shuffle$ True | SubAbility$ WindDraw
+SVar:WindDraw:DB$Draw | NumCards$ X | Defined$ Player.IsRemembered | SubAbility$ CleanTheWind
+SVar:CleanTheWind:DB$Cleanup | ClearRemembered$ True
+SVar:X:Remembered$Amount/Minus.1
+# Amount Minus 1 because the Player is also being remembered at this point
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon