diff --git a/Mage.Sets/src/mage/cards/a/AnimalFriend.java b/Mage.Sets/src/mage/cards/a/AnimalFriend.java
new file mode 100644
index 00000000000..24840b9438d
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AnimalFriend.java
@@ -0,0 +1,140 @@
+package mage.cards.a;
+
+import mage.MageObjectReference;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.GainAbilityWithAttachmentEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.game.permanent.token.SquirrelToken;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author grimreap124, xenohedron
+ */
+public final class AnimalFriend extends CardImpl {
+
+    public AnimalFriend(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
+        
+        this.subtype.add(SubType.AURA);
+
+        // Enchant creature
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
+        this.addAbility(new EnchantAbility(auraTarget));
+
+        // Enchanted creature has "Whenever this creature attacks, create a 1/1 green Squirrel creature token. Put a +1/+1 counter on that token for each Aura and Equipment attached to this creature other than Animal Friend."
+        this.addAbility(new SimpleStaticAbility(new AnimalFriendEffect()));
+
+    }
+
+    private AnimalFriend(final AnimalFriend card) {
+        super(card);
+    }
+
+    @Override
+    public AnimalFriend copy() {
+        return new AnimalFriend(this);
+    }
+}
+
+class AnimalFriendEffect extends GainAbilityWithAttachmentEffect {
+
+    AnimalFriendEffect() {
+        super("Enchanted creature has \"Whenever this creature attacks, create a 1/1 green Squirrel creature token. " +
+                        "Put a +1/+1 counter on that token for each Aura and Equipment attached to this creature other than {this}.\"",
+                (Effect) null, null, null);
+    }
+
+    private AnimalFriendEffect(final AnimalFriendEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AnimalFriendEffect copy() {
+        return new AnimalFriendEffect(this);
+    }
+
+    @Override
+    protected Ability makeAbility(Game game, Ability source) {
+        if (source == null || game == null) {
+            return null;
+        }
+        MageObjectReference thing = new MageObjectReference(source.getSourceObject(game), game);
+        Permanent perm = game.getPermanent(source.getSourceId());
+        return new AttacksTriggeredAbility(new AnimalFriendTokenEffect(thing, perm.getName()), false, "");
+    }
+}
+
+class AnimalFriendTokenEffect extends OneShotEffect {
+
+    MageObjectReference aura;
+
+    AnimalFriendTokenEffect(MageObjectReference aura, String name) {
+        super(Outcome.PutCreatureInPlay);
+        this.aura = aura;
+        staticText = "create a 1/1 green Squirrel creature token." +
+                " Put a +1/+1 counter on that token for each Aura and Equipment attached to this creature other than " + name;
+    }
+
+    private AnimalFriendTokenEffect(final AnimalFriendTokenEffect effect) {
+        super(effect);
+        this.aura = effect.aura;
+    }
+
+    @Override
+    public AnimalFriendTokenEffect copy() {
+        return new AnimalFriendTokenEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        CreateTokenEffect effect = new CreateTokenEffect(new SquirrelToken());
+        if (!effect.apply(game, source)) {
+            return false;
+        }
+        Permanent p = source.getSourcePermanentIfItStillExists(game);
+        int xValue = 0;
+        if (p != null) {
+            List<UUID> attachments = p.getAttachments();
+            for (UUID attachmentId : attachments) {
+                Permanent attached = game.getPermanent(attachmentId);
+                if (attached != null
+                        && (attached.hasSubtype(SubType.AURA, game) || attached.hasSubtype(SubType.EQUIPMENT, game))
+                        && !aura.refersTo(attached, game)) {
+                    xValue++;
+                }
+            }
+
+        }
+        if (xValue <= 0) {
+            return true;
+        }
+        for (UUID id : effect.getLastAddedTokenIds()) {
+            Permanent token = game.getPermanent(id);
+            if (token != null) {
+                token.addCounters(CounterType.P1P1.createInstance(xValue), source.getControllerId(), source, game);
+            }
+        }
+        return true;
+    }
+
+}
diff --git a/Mage.Sets/src/mage/sets/Fallout.java b/Mage.Sets/src/mage/sets/Fallout.java
index 88883a5d672..b264a53e8b9 100644
--- a/Mage.Sets/src/mage/sets/Fallout.java
+++ b/Mage.Sets/src/mage/sets/Fallout.java
@@ -26,6 +26,7 @@ public final class Fallout extends ExpansionSet {
         cards.add(new SetCardInfo("Almost Perfect", 90, Rarity.RARE, mage.cards.a.AlmostPerfect.class));
         cards.add(new SetCardInfo("Alpha Deathclaw", 91, Rarity.RARE, mage.cards.a.AlphaDeathclaw.class));
         cards.add(new SetCardInfo("Anguished Unmaking", 209, Rarity.RARE, mage.cards.a.AnguishedUnmaking.class));
+        cards.add(new SetCardInfo("Animal Friend", 72, Rarity.RARE, mage.cards.a.AnimalFriend.class));
         cards.add(new SetCardInfo("Arcade Gannon", 92, Rarity.RARE, mage.cards.a.ArcadeGannon.class));
         cards.add(new SetCardInfo("Arcane Signet", 224, Rarity.UNCOMMON, mage.cards.a.ArcaneSignet.class));
         cards.add(new SetCardInfo("Armory Paladin", 93, Rarity.RARE, mage.cards.a.ArmoryPaladin.class));
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java
index 8d4a49cc90c..a5b2ce86db3 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java
@@ -50,7 +50,7 @@ public class GainAbilityWithAttachmentEffect extends ContinuousEffectImpl {
         this.effects.addAll(effect.effects);
         this.targets.addAll(effect.targets);
         this.costs.addAll(effect.costs);
-        this.useAttachedCost = effect.useAttachedCost.copy();
+        this.useAttachedCost = effect.useAttachedCost == null ? null : effect.useAttachedCost.copy();
     }
 
     @Override