diff --git a/Mage.Sets/src/mage/cards/r/RalZarek.java b/Mage.Sets/src/mage/cards/r/RalZarek.java
index 2d15024ad90..b88a1dfeb50 100644
--- a/Mage.Sets/src/mage/cards/r/RalZarek.java
+++ b/Mage.Sets/src/mage/cards/r/RalZarek.java
@@ -31,8 +31,11 @@ import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.TapTargetEffect;
+import mage.abilities.effects.common.UntapTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
@@ -40,11 +43,11 @@ import mage.constants.Outcome;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.mageobject.AnotherTargetPredicate;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 import mage.game.turn.TurnMod;
 import mage.players.Player;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreatureOrPlayer;
+import mage.target.targetpointer.SecondTargetPointer;
 
 /**
  *
@@ -65,8 +68,17 @@ public class RalZarek extends CardImpl {
         this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4));
 
         // +1: Tap target permanent, then untap another target permanent.
-        LoyaltyAbility ability1 = new LoyaltyAbility(new RalZarekEffect(), 1);
-        ability1.addTarget(new TargetPermanent(2, 2, new FilterPermanent(), false));
+        LoyaltyAbility ability1 = new LoyaltyAbility(new TapTargetEffect(), 1);
+        TargetPermanent firstTarget = new TargetPermanent();
+        firstTarget.setTargetTag(1);
+        ability1.addTarget(firstTarget);
+        Effect effect = new UntapTargetEffect();
+        effect.setText(", then untap another target permanent");
+        effect.setTargetPointer(new SecondTargetPointer());
+        ability1.addEffect(effect);
+        TargetPermanent secondTarget = new TargetPermanent(secondFilter);
+        secondTarget.setTargetTag(2);
+        ability1.addTarget(secondTarget);
         this.addAbility(ability1);
 
         // -2: Ral Zarek deals 3 damage to target creature or player.
@@ -89,40 +101,6 @@ public class RalZarek extends CardImpl {
     }
 }
 
-class RalZarekEffect extends OneShotEffect {
-
-    public RalZarekEffect() {
-        super(Outcome.Tap);
-        this.staticText = "Tap target permanent, then untap another target permanent";
-    }
-
-    public RalZarekEffect(final RalZarekEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public RalZarekEffect copy() {
-        return new RalZarekEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Player controller = game.getPlayer(source.getControllerId());
-        if (controller != null) {
-            Permanent tapPermanent = game.getPermanent(source.getTargets().get(0).getTargets().get(0));
-            if (tapPermanent != null) {
-                tapPermanent.tap(game);
-            }
-            Permanent unTapPermanent = game.getPermanent(source.getTargets().get(0).getTargets().get(1));
-            if (unTapPermanent != null) {
-                unTapPermanent.untap(game);
-            }
-            return true;
-        }
-        return false;
-    }
-}
-
 class RalZarekExtraTurnsEffect extends OneShotEffect {
 
     public RalZarekExtraTurnsEffect() {
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/RalZarekTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/RalZarekTest.java
new file mode 100644
index 00000000000..8da714e4de3
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/RalZarekTest.java
@@ -0,0 +1,68 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.planeswalker;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX
+ */
+public class RalZarekTest extends CardTestPlayerBase {
+
+    @Test
+    public void testFirstAbility() {
+        // +1: Tap target permanent, then untap another target permanent.
+        // -2: Ral Zarek deals 3 damage to target creature or player.
+        // -7: Flip five coins. Take an extra turn after this one for each coin that comes up heads.
+        String ralZarek = "Ral Zarek"; // {2}{U}{R}
+        addCard(Zone.HAND, playerA, ralZarek);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, ralZarek);
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1:", "Silvercoat Lion"); // Ral Zarek +1
+        addTarget(playerA, "Mountain"); // Untap the Mountain
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, ralZarek, 1);
+        assertCounterCount(playerA, ralZarek, CounterType.LOYALTY, 5);
+
+        assertTapped("Mountain", false);
+        assertTapped("Silvercoat Lion", true);
+    }
+}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
index ce24f5097d9..e9f5fbc0f8c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java
@@ -56,6 +56,7 @@ public class UntapTargetEffect extends OneShotEffect {
 
     public UntapTargetEffect(final UntapTargetEffect effect) {
         super(effect);
+        this.useOnlyTargetPointer = effect.useOnlyTargetPointer;
     }
 
     @Override