diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js
index e9793e0c6..3129610b0 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js
@@ -53,7 +53,7 @@ var set20 = {
     '20_53': 'http://lotrtcg.org/coreset/dwarven/gimlide(r1).jpg',
     '20_54': 'http://lotrtcg.org/coreset/dwarven/gimlisp.jpg',
     '20_55': 'http://lotrtcg.org/coreset/dwarven/gimlisbattleaxewoe.jpg',
-    '20_56': 'http://lotrtcg.org/coreset/dwarven/gimlispipe.jpg',
+    '20_56': 'http://www.lotrtcg.org/coreset/dwarven/gimlispipe(r2).jpg',
     '20_57': 'http://lotrtcg.org/coreset/dwarven/gloinvd(r1).jpg',
     '20_58': 'http://lotrtcg.org/coreset/dwarven/handaxe.jpg',
     '20_59': 'http://lotrtcg.org/coreset/dwarven/killingblow.jpg',
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_056.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_056.java
index dfcdcfe1e..93352e7eb 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_056.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_056.java
@@ -2,15 +2,17 @@ package com.gempukku.lotro.cards.set20.dwarven;
 
 import com.gempukku.lotro.cards.AbstractAttachableFPPossession;
 import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect;
+import com.gempukku.lotro.cards.effects.CheckPhaseLimitEffect;
 import com.gempukku.lotro.cards.effects.ForEachYouSpotEffect;
-import com.gempukku.lotro.cards.effects.SelfDiscardEffect;
-import com.gempukku.lotro.cards.effects.choose.ChooseAndStackCardsFromDiscardEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
 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.ChooseActiveCardEffect;
+import com.gempukku.lotro.logic.modifiers.KeywordModifier;
 import com.gempukku.lotro.logic.timing.Action;
 
 import java.util.Collections;
@@ -19,40 +21,44 @@ import java.util.List;
 /**
  * 1
  * •Gimli's Pipe
- * Dwarven	Possession • Pipe
- * Bearer must be Gimli.
- * Manuever: Discard a pipeweed possession and spot X pipes to stack X [Dwarven] events from your discard pile on
- * a [Dwarven] support area condition.
+ * Possession • Pipe
+ * Bearer must be a Dwarf.
+ * Skirmish: If bearer is Gimli, discard a pipeweed possession and spot X pipes to make a companion bearing a pipe
+ * damage +X (limit once per phase).
+ * http://www.lotrtcg.org/coreset/dwarven/gimlispipe(r2).jpg
  */
-public class Card20_056 extends AbstractAttachableFPPossession{
+public class Card20_056 extends AbstractAttachableFPPossession {
     public Card20_056() {
-        super(1, 0, 0, Culture.DWARVEN, PossessionClass.PIPE,  "Gimli's Pipe", null, true);
+        super(1, 0, 0, Culture.DWARVEN, PossessionClass.PIPE, "Gimli's Pipe", null, true);
     }
 
     @Override
     protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
-        return Filters.gimli;
+        return Race.DWARF;
     }
 
     @Override
     protected List<? extends Action> getExtraInPlayPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) {
-        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.MANEUVER, self)
-                && PlayConditions.canDiscardFromPlay(self, game, PossessionClass.PIPEWEED, CardType.POSSESSION)) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)
+                && PlayConditions.isActive(game, Filters.gimli, Filters.hasAttached(self))
+                && PlayConditions.canDiscardFromPlay(self, game, CardType.POSSESSION, Keyword.PIPEWEED)) {
             final ActivateCardAction action = new ActivateCardAction(self);
             action.appendCost(
-                    new SelfDiscardEffect(self));
+                    new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION, Keyword.PIPEWEED));
             action.appendCost(
                     new ForEachYouSpotEffect(playerId, PossessionClass.PIPE) {
                         @Override
-                        protected void spottedCards(int spotCount) {
+                        protected void spottedCards(final int spotCount) {
                             action.appendEffect(
-                                    new ChooseActiveCardEffect(self, playerId, "Choose a DWARVEN condition in your support area", Culture.DWARVEN, CardType.CONDITION, Keyword.SUPPORT_AREA) {
-                                        @Override
-                                        protected void cardSelected(LotroGame game, PhysicalCard card) {
-                                            action.appendEffect(
-                                                    new ChooseAndStackCardsFromDiscardEffect(action, playerId, 1, 1, card, Culture.DWARVEN, CardType.EVENT));
-                                        }
-                                    });
+                                    new CheckPhaseLimitEffect(action, self, 1,
+                                            new ChooseActiveCardEffect(self, playerId, "Choose companion bearing a pipe", CardType.COMPANION, Filters.hasAttached(PossessionClass.PIPE)) {
+                                                @Override
+                                                protected void cardSelected(LotroGame game, PhysicalCard card) {
+                                                    action.appendEffect(
+                                                            new AddUntilEndOfPhaseModifierEffect(
+                                                                    new KeywordModifier(self, card, Keyword.DAMAGE, spotCount)));
+                                                }
+                                            }));
                         }
                     });
             return Collections.singletonList(action);