diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 0c228121070..878a6cb975e 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -279,6 +279,12 @@ public class PhaseHandler implements java.io.Serializable {
 
                 case DRAW:
                     playerTurn.drawCard();
+                    for (Player p : game.getPlayers()) {
+                        if (p.isOpponentOf(playerTurn) &&
+                                p.hasKeyword("You draw a card during each opponent's draw step.")) {
+                            p.drawCard();
+                        }
+                    }
                     break;
 
                 case MAIN1:
diff --git a/forge-game/src/main/java/forge/game/phase/Untap.java b/forge-game/src/main/java/forge/game/phase/Untap.java
index b13a12a64b1..9b951b5a35a 100644
--- a/forge-game/src/main/java/forge/game/phase/Untap.java
+++ b/forge-game/src/main/java/forge/game/phase/Untap.java
@@ -166,8 +166,14 @@ public class Untap extends Phase {
         List<Card> cardsWithKW = CardLists.getKeyword(game.getCardsIn(ZoneType.Battlefield),
                 "CARDNAME untaps during each other player's untap step.");
         cardsWithKW = CardLists.getNotKeyword(cardsWithKW, "This card doesn't untap.");
-        
         cardsWithKW = CardLists.filterControlledBy(cardsWithKW, player.getAllOtherPlayers());
+
+        List<Card> cardsWithKW2 = CardLists.getKeyword(game.getCardsIn(ZoneType.Battlefield),
+                "CARDNAME untaps during each opponent's untap step.");
+        cardsWithKW2 = CardLists.getNotKeyword(cardsWithKW2, "This card doesn't untap.");
+        cardsWithKW2 = CardLists.filterControlledBy(cardsWithKW2, player.getOpponents());
+
+        cardsWithKW.addAll(cardsWithKW2);
         for (final Card cardWithKW : cardsWithKW) {
             if (cardWithKW.isExertedBy(player)) {
                 continue;
diff --git a/forge-gui/res/cardsfolder/upcoming/teferi_who_slows_the_sunset.txt b/forge-gui/res/cardsfolder/upcoming/teferi_who_slows_the_sunset.txt
new file mode 100644
index 00000000000..13c9254a446
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/teferi_who_slows_the_sunset.txt
@@ -0,0 +1,17 @@
+Name:Teferi, Who Slows the Sunset
+ManaCost:2 W U
+Types:Legendary Planeswalker Teferi
+Loyalty:4
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact | TgtPrompt$ Choose up to one target artifact | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBChooseCreature | StackDescription$ Choose up to one target artifact, up to one target creature, and up to one target land. | SpellDescription$ Choose up to one target artifact, up to one target creature, and up to one target land. Untap the chosen permanents you control. Tap the chosen permanents you don't control. You gain 2 life.
+SVar:DBChooseCreature:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Choose up to one target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBChooseLand | StackDescription$ None
+SVar:DBChooseLand:DB$ Pump | ValidTgts$ Land | TgtPrompt$ Choose up to one target land | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBUntap | StackDescription$ None
+SVar:DBUntap:DB$ Untap | Defined$ Targeted.YouCtrl | SubAbility$ DBTap | StackDescription$ Untap the chosen permanents you control.
+SVar:DBTap:DB$ Tap | Defined$ Targeted.YouDontCtrl | SubAbility$ DBGainLife | StackDescription$ Tap the chosen permanents you don't control.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
+A:AB$ Dig | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | DigNum$ 3 | ChangeNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Teferi, Who Slows the Sunset | Image$ emblem_teferi_who_slows_the_sunset | StaticAbilities$ UntapOppStep,DrawOppStep | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Untap all permanents you control during each opponent's untap step" and "You draw a card during each opponent's draw step."
+SVar:UntapOppStep:Mode$ Continuous | EffectZone$ Command | Affected$ Permanent.YouCtrl | AddHiddenKeyword$ CARDNAME untaps during each opponent's untap step. | Description$ Untap all permanents you control during each opponent's untap step.
+SVar:DrawOppStep:Mode$ Continuous | EffectZone$ Command | Affected$ You | AddKeyword$ You draw a card during each opponent's draw step. | Description$ You draw a card during each opponent's draw step.
+SVar:PlayMain1:TRUE
+DeckHas:Ability$LifeGain
+Oracle:[+1]: Choose up to one target artifact, up to one target creature, and up to one target land. Untap the chosen permanents you control. Tap the chosen permanents you don't control. You gain 2 life.\n[-2]: Look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.\n[-7]: You get an emblem with "Untap all permanents you control during each opponent's untap step" and "You draw a card during each opponent's draw step."