diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
index 4eb1b913da3..c48e2693b29 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
@@ -21,6 +21,8 @@ import forge.game.Game;
 import forge.game.GameStage;
 import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
+import forge.game.phase.PhaseType;
+import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.util.Localizer;
 
@@ -72,6 +74,13 @@ public class TriggerDrawn extends Trigger {
             }
         }
 
+        if (hasParam("NotFirstCardInDrawStep")) {
+            final Player p = ((Player)runParams.get(AbilityKey.Player));
+            if (p.numDrawnThisDrawStep() == 1 && game.getPhaseHandler().is(PhaseType.DRAW, p)) {
+                return false;
+            }
+        }
+
         // trigger should not happen while Mulligan
         if (game.getAge() == GameStage.Mulligan) {
             return false;
diff --git a/forge-gui/res/cardsfolder/upcoming/C2020/xyris_the_writhing_storm.txt b/forge-gui/res/cardsfolder/upcoming/C2020/xyris_the_writhing_storm.txt
new file mode 100755
index 00000000000..b74ff5a6c0d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/C2020/xyris_the_writhing_storm.txt
@@ -0,0 +1,13 @@
+Name:Xyris, the Writhing Storm
+ManaCost:2 G U R
+Types:Legendary Creature Snake Leviathan
+PT:3/5
+K:Flying
+T:Mode$ Drawn | ValidCard$ Card.OppOwn | NotFirstCardInDrawStep$ True | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent draws a card except the first one they draw in each of their draw steps, create a 1/1 green Snake creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_snake | TokenOwner$ You
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you and that player each draw that many cards.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X | References$ X | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ TriggeredTarget | NumCards$ X | References$ X
+SVar:X:TriggerCount$DamageAmount
+DeckHas:Ability$Token
+Oracle:Flying\nWhenever an opponent draws a card except the first one they draw in each of their draw steps, create a 1/1 green Snake creature token.\nWhenever Xyris, the Writhing Storm deals combat damage to a player, you and that player each draw that many cards.