diff --git a/Mage.Sets/src/mage/cards/d/DeliveryMoogle.java b/Mage.Sets/src/mage/cards/d/DeliveryMoogle.java
new file mode 100644
index 00000000000..f2d46eabd0f
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/d/DeliveryMoogle.java
@@ -0,0 +1,51 @@
+package mage.cards.d;
+
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.search.SearchLibraryGraveyardPutInHandEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.ComparisonType;
+import mage.constants.SubType;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterArtifactCard;
+import mage.filter.predicate.mageobject.ManaValuePredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class DeliveryMoogle extends CardImpl {
+
+    private static final FilterCard filter = new FilterArtifactCard("an artifact card with mana value 2 or less");
+
+    static {
+        filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 3));
+    }
+
+    public DeliveryMoogle(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
+
+        this.subtype.add(SubType.MOOGLE);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // When this creature enters, search your library and/or graveyard for an artifact card with mana value 2 or less, reveal it, and put it into your hand. If you search your library this way, shuffle.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryGraveyardPutInHandEffect(filter)));
+    }
+
+    private DeliveryMoogle(final DeliveryMoogle card) {
+        super(card);
+    }
+
+    @Override
+    public DeliveryMoogle copy() {
+        return new DeliveryMoogle(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/FinalFantasy.java b/Mage.Sets/src/mage/sets/FinalFantasy.java
index d26e950b83a..03ee56899e4 100644
--- a/Mage.Sets/src/mage/sets/FinalFantasy.java
+++ b/Mage.Sets/src/mage/sets/FinalFantasy.java
@@ -159,6 +159,7 @@ public final class FinalFantasy extends ExpansionSet {
         cards.add(new SetCardInfo("Dark Confidant", 94, Rarity.MYTHIC, mage.cards.d.DarkConfidant.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Dark Knight's Greatsword", 95, Rarity.UNCOMMON, mage.cards.d.DarkKnightsGreatsword.class));
         cards.add(new SetCardInfo("Deadly Embrace", 557, Rarity.RARE, mage.cards.d.DeadlyEmbrace.class));
+        cards.add(new SetCardInfo("Delivery Moogle", 15, Rarity.UNCOMMON, mage.cards.d.DeliveryMoogle.class));
         cards.add(new SetCardInfo("Demon Wall", 97, Rarity.UNCOMMON, mage.cards.d.DemonWall.class));
         cards.add(new SetCardInfo("Diamond Weapon", 183, Rarity.UNCOMMON, mage.cards.d.DiamondWeapon.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Diamond Weapon", 470, Rarity.UNCOMMON, mage.cards.d.DiamondWeapon.class, NON_FULL_USE_VARIOUS));
diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java
index f94fe375a21..05e7471e6f3 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java
@@ -34,8 +34,10 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect {
         super(Outcome.Benefit);
         this.filter = filter;
         this.forceToSearchBoth = forceToSearchBoth;
-        staticText = (youMay ? "you may " : "") + "search your library and" + (forceToSearchBoth ? "" : "/or") + " graveyard for a card named " + filter.getMessage()
-                + ", reveal it, and put it into your hand. " + (forceToSearchBoth ? "Then shuffle" : "If you search your library this way, shuffle");
+        staticText = (youMay ? "you may " : "") + "search your library and" + (forceToSearchBoth ? "" : "/or") +
+                " graveyard for " + (filter.getMessage().contains(" card") ? "" : "a card named ") +
+                filter.getMessage() + ", reveal it, and put it into your hand. " +
+                (forceToSearchBoth ? "Then shuffle" : "If you search your library this way, shuffle");
     }
 
     protected SearchLibraryGraveyardPutInHandEffect(final SearchLibraryGraveyardPutInHandEffect effect) {