diff --git a/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java b/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java
index c658ac7a327..ccfebd52da3 100644
--- a/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java
+++ b/Mage.Sets/src/mage/sets/eventide/CacheRaiders.java
@@ -37,6 +37,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
+import mage.target.Target;
 import mage.target.common.TargetControlledPermanent;
 
 /**
@@ -54,7 +55,9 @@ public class CacheRaiders extends CardImpl<CacheRaiders> {
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new ReturnToHandTargetEffect(), Constants.TargetController.YOU, false);
-        ability.addTarget(new TargetControlledPermanent());
+        Target target = new TargetControlledPermanent();
+        target.setRequired(true);
+        ability.addTarget(target);
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java
index d23b3180c69..e3ebb13d8da 100644
--- a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java
+++ b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java
@@ -35,7 +35,9 @@ import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.condition.common.ControlsPermanentCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.decorator.ConditionalContinousEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.continious.AddCardSubTypeTargetEffect;
 import mage.abilities.effects.common.continious.GainControlTargetEffect;
@@ -43,9 +45,12 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
 import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.CardIdPredicate;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -72,6 +77,12 @@ public class OliviaVoldaren extends CardImpl<OliviaVoldaren> {
         this.color.setBlack(true);
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
+        
+        String rule = "Gain control of target Vampire for as long as you control Olivia Voldaren";
+
+        FilterPermanent filter2 = new FilterPermanent();
+        filter2.add(new ControllerPredicate(Constants.TargetController.YOU));
+        filter2.add(new CardIdPredicate(this.getId()));
 
         this.addAbility(FlyingAbility.getInstance());
 
@@ -83,7 +94,8 @@ public class OliviaVoldaren extends CardImpl<OliviaVoldaren> {
         this.addAbility(ability);
 
         // {3}{B}{B}: Gain control of target Vampire for as long as you control Olivia Voldaren.
-        Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainControlTargetEffect(Constants.Duration.WhileOnBattlefield), new ManaCostsImpl("{3}{B}{B}"));
+        ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Constants.Duration.Custom), new ControlsPermanentCondition(filter2), rule);
+        Ability ability2 = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{B}{B}"));
         ability2.addTarget(new TargetCreaturePermanent(vampireFilter));
         this.addAbility(ability2);
     }
diff --git a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java
new file mode 100644
index 00000000000..033b7959e44
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java
@@ -0,0 +1,87 @@
+/*
+ *  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 mage.sets.zendikar;
+
+import java.util.UUID;
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.Constants.TargetController;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.LandfallAbility;
+import mage.abilities.condition.common.ControlsPermanentCondition;
+import mage.abilities.decorator.ConditionalContinousEffect;
+import mage.abilities.effects.common.continious.GainControlTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.CardIdPredicate;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class RoilElemental extends CardImpl<RoilElemental> {
+
+    public RoilElemental(UUID ownerId) {
+        super(ownerId, 62, "Roil Elemental", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}{U}{U}");
+        this.expansionSetCode = "ZEN";
+        this.subtype.add("Elemental");
+
+        this.color.setBlue(true);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+        String rule = "you may gain control of target creature for as long as you control Roil Elemental";
+
+        FilterPermanent filter = new FilterPermanent();
+        filter.add(new ControllerPredicate(TargetController.YOU));
+        filter.add(new CardIdPredicate(this.getId()));
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Landfall - Whenever a land enters the battlefield under your control, you may gain control of target creature for as long as you control Roil Elemental.
+        ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Constants.Duration.Custom), new ControlsPermanentCondition(filter), rule);
+        Ability ability = new LandfallAbility(Constants.Zone.BATTLEFIELD, effect, true);
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+    }
+
+    public RoilElemental(final RoilElemental card) {
+        super(card);
+    }
+
+    @Override
+    public RoilElemental copy() {
+        return new RoilElemental(this);
+    }
+}
\ No newline at end of file