diff --git a/forge-gui/res/cardsfolder/w/windfall.txt b/forge-gui/res/cardsfolder/w/windfall.txt
index 993084e53e0..a8c208b64a0 100644
--- a/forge-gui/res/cardsfolder/w/windfall.txt
+++ b/forge-gui/res/cardsfolder/w/windfall.txt
@@ -1,14 +1,11 @@
 Name:Windfall
 ManaCost:2 U
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 U | RepeatPlayers$ Player | RepeatSubAbility$ WindfallDiscard | SubAbility$ WindfallDraw | SpellDescription$ Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.
-SVar:WindfallDiscard:DB$ Discard | Defined$ Player.IsRemembered | Mode$ Hand | RememberDiscarded$ True | SubAbility$ WindfallSaveAmount
-SVar:WindfallSaveAmount:DB$ StoreSVar | SVar$ MaxDiscard | Type$ CountSVar | Expression$ NumDiscard | ConditionCheckSVar$ NumDiscard | ConditionSVarCompare$ GTMaxDiscard | References$ NumDiscard | SubAbility$ WindfallCleanUp
-SVar:WindfallCleanUp:DB$ Cleanup | ClearRemembered$ True
-SVar:WindfallDraw:DB$ Draw | Defined$ Each | NumCards$ MaxDiscard | References$ MaxDiscard | SubAbility$ WindfallReset
-SVar:WindfallReset:DB$ StoreSVar | SVar$ MaxDiscard | Type$ Number | Expression$ 0
-SVar:NumDiscard:Count$RememberedSize/Minus.1
-SVar:MaxDiscard:Number$0
+A:SP$ Discard | Cost$ 2 U | Defined$ Each |  Mode$ Hand | RememberDiscarded$ True | SubAbility$ WindfallDraw | SpellDescription$ Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.
+SVar:WindfallDraw:DB$ Draw | Defined$ Each | NumCards$ X | References$ X | SubAbility$ WindfallCleanup
+SVar:WindfallCleanup:DB$ Cleanup | ClearRemembered$ True
+#some cards may allow you to discard to other zones
+SVar:X:PlayerCountPlayers$HighestValidGraveyard,Library,Exile Card.IsRemembered+YouOwn
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/windfall.jpg
 Oracle:Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.
\ No newline at end of file