diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java
index 3ab447d18..68b19cfee 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java
@@ -2,20 +2,21 @@ package com.gempukku.lotro.cards.set31.dwarven;
 
 import com.gempukku.lotro.cards.AbstractPermanent;
 import com.gempukku.lotro.cards.PlayConditions;
-import com.gempukku.lotro.cards.effects.ChoiceEffect;
-import com.gempukku.lotro.cards.effects.SelfDiscardEffect;
+import com.gempukku.lotro.cards.effects.PutCardFromStackedIntoHandEffect;
 import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
-import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDeckEffect;
-import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDiscardEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndStackCardsFromHandEffect;
 import com.gempukku.lotro.common.*;
 import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.actions.ActivateCardAction;
-import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect;
-import com.gempukku.lotro.logic.timing.Effect;
+import com.gempukku.lotro.logic.effects.AddTwilightEffect;
+import com.gempukku.lotro.logic.effects.ChooseArbitraryCardsEffect;
+import com.gempukku.lotro.logic.modifiers.Modifier;
+import com.gempukku.lotro.logic.modifiers.TwilightCostModifier;
 import com.gempukku.lotro.logic.timing.Action;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -26,54 +27,48 @@ import java.util.List;
  * Culture: Dwarven
  * Twilight Cost: 2
  * Type: Artifact • Support Area
- * Game Text: Fellowship: Exert an Elf to heal a Man. Regroup: Exert a Man and discard this artifact to play an Elf from
- * your draw deck or discard pile.
+ * Game Text: Fellowship: Add (1) to take a card stacked here into hand. Regroup: Exert an ally to stack a [DWARVEN]
+ * event from hand on Emeralds of Girion.
  */
 public class Card31_003 extends AbstractPermanent {
     public Card31_003() {
         super(Side.FREE_PEOPLE, 2, CardType.ARTIFACT, Culture.DWARVEN, Zone.SUPPORT, "Emeralds of Girion", null, true);
-	}
+    }
 
 
     @Override
     protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) {
-        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)
-	        && PlayConditions.canExert(self, game, Race.ELF)) {
-	    final ActivateCardAction action = new ActivateCardAction(self);
-            action.appendCost(
-	            new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF));
-	    action.appendEffect(
-	            new ChooseAndHealCharactersEffect(action, playerId, 1, 1, Race.MAN));
-	    return Collections.singletonList(action);
-	}
-        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)
-	        && PlayConditions.canExert(self, game, Race.MAN)) {
-	    final ActivateCardAction action = new ActivateCardAction(self);
-	    action.appendCost(
-	        new ChooseAndExertCharactersEffect(action, playerId, 1, 1,  Race.MAN));
-	    action.appendCost(
-	        new SelfDiscardEffect(self));
-            List<Effect> possibleEffects = new LinkedList<Effect>();
-            possibleEffects.add(
-                    new ChooseAndPlayCardFromDeckEffect(playerId, Race.ELF) {
-                        @Override
-                        public String getText(LotroGame game) {
-                            return "Play an Elf from your draw deck";
-                        }
-                    });
-            if (PlayConditions.canPlayFromDiscard(playerId, game, Race.ELF)) {
-                possibleEffects.add(
-                        new ChooseAndPlayCardFromDiscardEffect(playerId, game, Race.ELF) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) {
+            List<PhysicalCard> stackedCards = game.getGameState().getStackedCards(self);
+            if (stackedCards.size() > 0) {
+                final ActivateCardAction action = new ActivateCardAction(self);
+                action.appendCost(
+                        new AddTwilightEffect(self, 1));
+                action.appendEffect(
+                        new ChooseArbitraryCardsEffect(playerId, "Choose card", stackedCards, 1, 1) {
                             @Override
-                            public String getText(LotroGame game) {
-                                return "Play an Elf from your discard pile";
+                            protected void cardsSelected(LotroGame game, Collection<PhysicalCard> selectedCards) {
+                                for (PhysicalCard selectedCard : selectedCards) {
+                                    action.appendEffect(
+                                            new PutCardFromStackedIntoHandEffect(selectedCard));
+                                }
                             }
                         });
+                return Collections.singletonList(action);
             }
-            action.appendEffect(
-                    new ChoiceEffect(action, playerId, possibleEffects));
-	    return Collections.singletonList(action);
         }
-	return null;
+
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)
+            && PlayConditions.canExert(self, game, CardType.ALLY)) {
+            if (Filters.filter(game.getGameState().getHand(playerId), game.getGameState(), game.getModifiersQuerying(),
+                    Culture.DWARVEN, CardType.EVENT).size() > 0) {
+                final ActivateCardAction action = new ActivateCardAction(self);
+                action.appendCost(new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.ALLY));
+                action.appendEffect(
+                        new ChooseAndStackCardsFromHandEffect(action, playerId, 1, 1, self, Culture.DWARVEN));
+                return Collections.singletonList(action);
+            }
+        }
+        return null;
     }
 }