diff --git a/Mage.Sets/src/mage/sets/ravnika/WateryGrave.java b/Mage.Sets/src/mage/sets/ravnika/WateryGrave.java
new file mode 100644
index 0000000000..28058c22b1
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/ravnika/WateryGrave.java
@@ -0,0 +1,66 @@
+/*
+ *  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.ravnika;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.costs.common.PayLifeCost;
+import mage.abilities.effects.common.TapSourceUnlessPaysEffect;
+import mage.abilities.mana.BlackManaAbility;
+import mage.abilities.mana.BlueManaAbility;
+import mage.cards.CardImpl;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class WateryGrave extends CardImpl<WateryGrave> {
+
+	public WateryGrave(UUID ownerId) {
+		super(ownerId, 286, "Watery Grave", Rarity.RARE, new CardType[]{CardType.LAND}, null);
+		this.expansionSetCode = "RAV";
+		this.subtype.add("Island");
+		this.subtype.add("Swamp");
+		this.addAbility(new BlueManaAbility());
+		this.addAbility(new BlackManaAbility());
+		this.addAbility(new EntersBattlefieldAbility(new TapSourceUnlessPaysEffect(new PayLifeCost(2)), "As Watery Grave enters the battlefield, you may pay 2 life. If you don't, Watery Grave enters the battlefield tapped."));
+	}
+
+	public WateryGrave(final WateryGrave card) {
+		super(card);
+	}
+
+	@Override
+	public WateryGrave copy() {
+		return new WateryGrave(this);
+	}
+
+}
diff --git a/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java b/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
new file mode 100644
index 0000000000..36449a092c
--- /dev/null
+++ b/Mage/src/mage/abilities/effects/common/TapSourceUnlessPaysEffect.java
@@ -0,0 +1,77 @@
+/*
+ *  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.abilities.effects.common;
+
+import mage.Constants.Outcome;
+import mage.abilities.Ability;
+import mage.abilities.costs.Cost;
+import mage.abilities.effects.OneShotEffect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class TapSourceUnlessPaysEffect extends OneShotEffect<TapSourceUnlessPaysEffect> {
+
+	protected Cost cost;
+
+	public TapSourceUnlessPaysEffect(Cost cost) {
+		super(Outcome.Tap);
+		this.cost = cost;
+	}
+
+	public TapSourceUnlessPaysEffect(final TapSourceUnlessPaysEffect effect) {
+		super(effect);
+		this.cost = effect.cost;
+	}
+
+	@Override
+	public boolean apply(Game game, Ability source) {
+		Player player = game.getPlayer(source.getControllerId());
+		if (player != null && player.chooseUse(Outcome.Benefit, cost.getText() + " or {this} comes into play tapped?", game)) {
+			cost.clearPaid();
+			if (cost.pay(game, source.getId(), source.getControllerId(), false))
+				return true;
+		}
+		Permanent permanent = game.getPermanent(source.getSourceId());
+		if (permanent != null)
+			permanent.setTapped(true);
+		return true;
+	}
+
+	@Override
+	public TapSourceUnlessPaysEffect copy() {
+		return new TapSourceUnlessPaysEffect(this);
+	}
+
+
+}
diff --git a/Mage/src/mage/target/common/TargetBasicLandCard.java b/Mage/src/mage/target/common/TargetBasicLandCard.java
index d924b96ca1..b6b477222d 100644
--- a/Mage/src/mage/target/common/TargetBasicLandCard.java
+++ b/Mage/src/mage/target/common/TargetBasicLandCard.java
@@ -29,6 +29,7 @@
 package mage.target.common;
 
 import mage.Constants.Zone;
+import mage.filter.Filter.ComparisonScope;
 import mage.target.TargetCard;
 
 /**
@@ -39,11 +40,10 @@ public class TargetBasicLandCard extends TargetCard<TargetBasicLandCard> {
 
 	public TargetBasicLandCard(Zone zone) {
 		super(zone);
-		filter.getName().add("Island");
-		filter.getName().add("Forest");
-		filter.getName().add("Mountain");
-		filter.getName().add("Swamp");
-		filter.getName().add("Plains");
+		filter.getSupertype().add("Basic");
+		filter.setScopeSupertype(ComparisonScope.Any);
+		filter.getCardType().add("Land");
+		filter.setScopeCardType(ComparisonScope.Any);
 	}
 
 	public TargetBasicLandCard(final TargetBasicLandCard target) {