diff --git a/Mage.Sets/src/mage/cards/a/AstralDrift.java b/Mage.Sets/src/mage/cards/a/AstralDrift.java
new file mode 100644
index 0000000000..82b191e991
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AstralDrift.java
@@ -0,0 +1,138 @@
+package mage.cards.a;
+
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect;
+import mage.abilities.keyword.CyclingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.game.stack.StackAbility;
+import mage.game.stack.StackObject;
+import mage.players.Player;
+import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AstralDrift extends CardImpl {
+
+ public AstralDrift(UUID ownerId, CardSetInfo setInfo) {
+ super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}");
+
+ // Whenever you cycle Astral Drift or cycle another card while Astral Drift is on the battlefield, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step.
+ this.addAbility(new AstralDriftTriggeredAbility());
+
+ // Cycling {2}{W}
+ this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}{W}")));
+ }
+
+ private AstralDrift(final AstralDrift card) {
+ super(card);
+ }
+
+ @Override
+ public AstralDrift copy() {
+ return new AstralDrift(this);
+ }
+}
+
+class AstralDriftTriggeredAbility extends TriggeredAbilityImpl {
+
+ AstralDriftTriggeredAbility() {
+ super(Zone.ALL, new AstralDriftEffect(), true);
+ this.addTarget(new TargetCreaturePermanent());
+ }
+
+ private AstralDriftTriggeredAbility(final AstralDriftTriggeredAbility effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean checkEventType(GameEvent event, Game game) {
+ return event.getType() == GameEvent.EventType.ACTIVATED_ABILITY;
+ }
+
+ @Override
+ public boolean checkTrigger(GameEvent event, Game game) {
+ if (game.getState().getStack().isEmpty()) {
+ return false;
+ }
+ StackObject item = game.getState().getStack().getFirst();
+ if (!(item instanceof StackAbility
+ && item.getStackAbility() instanceof CyclingAbility)) {
+ return false;
+ }
+ if (event.getSourceId().equals(this.getSourceId())) {
+ return true;
+ }
+ if (game.getPermanent(getSourceId()) == null || !event.getPlayerId().equals(controllerId)) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public AstralDriftTriggeredAbility copy() {
+ return new AstralDriftTriggeredAbility(this);
+ }
+
+ @Override
+ public String getRule() {
+ return "Whenever you cycle {this} or cycle another card while {this} is on the battlefield, " +
+ "you may exile target creature. If you do, return that card to the battlefield " +
+ "under its owner's control at the beginning of the next end step.";
+ }
+}
+
+class AstralDriftEffect extends OneShotEffect {
+
+ AstralDriftEffect() {
+ super(Outcome.Detriment);
+ }
+
+ private AstralDriftEffect(final AstralDriftEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Player controller = game.getPlayer(source.getControllerId());
+ MageObject sourceObject = source.getSourceObject(game);
+ if (controller == null || sourceObject == null) {
+ return false;
+ }
+ Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
+ if (permanent == null) {
+ return true;
+ }
+ UUID exileId = UUID.randomUUID();
+ if (!controller.moveCardsToExile(permanent, source, game, true, exileId, sourceObject.getIdName())) {
+ return true;
+ }
+ //create delayed triggered ability
+ Effect effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect();
+ effect.setText("Return that card to the battlefield under its owner's control at the beginning of the next end step");
+ effect.setTargetPointer(new FixedTarget(permanent.getId(), game));
+ game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(effect), source);
+ return true;
+ }
+
+ @Override
+ public AstralDriftEffect copy() {
+ return new AstralDriftEffect(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/cards/a/AstralSlide.java b/Mage.Sets/src/mage/cards/a/AstralSlide.java
index a57d28dd50..f5efb9a9ec 100644
--- a/Mage.Sets/src/mage/cards/a/AstralSlide.java
+++ b/Mage.Sets/src/mage/cards/a/AstralSlide.java
@@ -48,7 +48,7 @@ class AstralSlideEffect extends OneShotEffect {
public AstralSlideEffect() {
super(Outcome.Detriment);
- staticText = "exile target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step";
+ staticText = "exile target creature. If you do, eturn that card to the battlefield under its owner's control at the beginning of the next end step";
}
public AstralSlideEffect(final AstralSlideEffect effect) {
diff --git a/Mage.Sets/src/mage/sets/ModernHorizons.java b/Mage.Sets/src/mage/sets/ModernHorizons.java
index 940fa7363e..abc65b42c1 100644
--- a/Mage.Sets/src/mage/sets/ModernHorizons.java
+++ b/Mage.Sets/src/mage/sets/ModernHorizons.java
@@ -30,6 +30,7 @@ public final class ModernHorizons extends ExpansionSet {
cards.add(new SetCardInfo("Altar of Dementia", 218, Rarity.RARE, mage.cards.a.AltarOfDementia.class));
cards.add(new SetCardInfo("Archmage's Charm", 40, Rarity.RARE, mage.cards.a.ArchmagesCharm.class));
cards.add(new SetCardInfo("Aria of Flame", 118, Rarity.RARE, mage.cards.a.AriaOfFlame.class));
+ cards.add(new SetCardInfo("Astral Drift", 3, Rarity.RARE, mage.cards.a.AstralDrift.class));
cards.add(new SetCardInfo("Ayula's Influence", 156, Rarity.RARE, mage.cards.a.AyulasInfluence.class));
cards.add(new SetCardInfo("Ayula, Queen Among Bears", 155, Rarity.RARE, mage.cards.a.AyulaQueenAmongBears.class));
cards.add(new SetCardInfo("Battle Screech", 4, Rarity.UNCOMMON, mage.cards.b.BattleScreech.class));