diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java
index f9be404353..66e4e59fd0 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java
@@ -90,7 +90,7 @@ class MindblazeEffect extends OneShotEffect<MindblazeEffect> {
         Player playerControls = game.getPlayer(source.getControllerId());
         if (player != null && playerControls != null) {
             Choice cardChoice = new ChoiceImpl();
-		    cardChoice.setChoices(Sets.getCardNames());
+		    cardChoice.setChoices(Sets.getNonLandCardNames());
             cardChoice.clearChoice();
             Choice numberChoice = new ChoiceImpl();
             numberChoice.setMessage("Choose a number greater than 0");
diff --git a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java
index 7e5b86cce0..e9ebf4437f 100644
--- a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java
+++ b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java
@@ -86,22 +86,18 @@ class HauntingEchoesEffect extends OneShotEffect<HauntingEchoesEffect> {
 	@Override
 	public boolean apply(Game game, Ability source) {
 		Player player = game.getPlayer(source.getFirstTarget());
-		Set<UUID> remove = new HashSet<UUID>();
-		for (Iterator<UUID> i = player.getGraveyard().iterator(); i.hasNext();) {
-			Card card = game.getCard(i.next());
-			if (!filter.match(card)) {
-				i.remove();
-				game.getExile().add(card);
-				for (UUID cardId: player.getLibrary().getCardList()) {
-					if (game.getCard(cardId).getName().equals(card.getName())) {
-						remove.add(cardId);
+		if (player != null) {
+			for (Card card: player.getGraveyard().getCards(game)) {
+				if (!filter.match(card)) {
+					card.moveToExile(null, "", source.getId(), game);
+					for (Card lcard: player.getLibrary().getCards(game)) {
+						if (lcard.getName().equals(card.getName())) {
+							lcard.moveToExile(null, "", source.getId(), game);					
+						}
 					}
 				}
 			}
 		}
-		for (UUID cardId: remove) {
-			game.getExile().add(player.getLibrary().remove(cardId, game));
-		}
 		game.getPlayer(source.getControllerId()).lookAtCards("Haunting Echoes", new CardsImpl(Zone.PICK, player.getLibrary().getCards(game)), game);
 		player.shuffleLibrary(game);
 		return true;
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java
new file mode 100644
index 0000000000..15a8c1c09b
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java
@@ -0,0 +1,120 @@
+/*
+ *  Copyright 2011 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.scarsofmirrodin;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Outcome;
+import mage.Constants.Rarity;
+import mage.Constants.Zone;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardsImpl;
+import mage.choices.Choice;
+import mage.choices.ChoiceImpl;
+import mage.game.Game;
+import mage.players.Player;
+import mage.sets.Sets;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class Memoricide extends CardImpl<Memoricide> {
+
+	public Memoricide(UUID ownerId) {
+		super(ownerId, 69, "Memoricide", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}");
+		this.expansionSetCode = "SOM";
+		this.color.setBlack(true);
+		this.getSpellAbility().addTarget(new TargetPlayer());
+		this.getSpellAbility().addEffect(new MemoricideEffect());
+	}
+
+	public Memoricide(final Memoricide card) {
+		super(card);
+	}
+
+	@Override
+	public Memoricide copy() {
+		return new Memoricide(this);
+	}
+
+}
+
+class MemoricideEffect extends OneShotEffect<MemoricideEffect> {
+	
+	public MemoricideEffect() {
+		super(Outcome.Exile);
+		staticText = "Name a nonland card. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles his or her library";
+	}
+	
+	public MemoricideEffect(final MemoricideEffect effect) {
+		super(effect);
+	}
+
+	@Override
+	public boolean apply(Game game, Ability source) {
+		Player player = game.getPlayer(targetPointer.getFirst(source));
+		Player controller = game.getPlayer(source.getControllerId());
+		if (player != null && controller != null) {
+			Choice cardChoice = new ChoiceImpl();
+			cardChoice.setChoices(Sets.getNonLandCardNames());
+			cardChoice.clearChoice();
+			controller.choose(Outcome.Exile, cardChoice, game);
+			String cardName = cardChoice.getChoice();
+			for (Card card: player.getGraveyard().getCards(game)) {
+				if (card.getName().equals(cardName)) {
+					card.moveToExile(null, "", source.getId(), game);					
+				}
+			}
+			for (Card card: player.getHand().getCards(game)) {
+				if (card.getName().equals(cardName)) {
+					card.moveToExile(null, "", source.getId(), game);					
+				}
+			}
+			for (Card card: player.getLibrary().getCards(game)) {
+				if (card.getName().equals(cardName)) {
+					card.moveToExile(null, "", source.getId(), game);					
+				}
+			}
+			controller.lookAtCards("Memoricide Hand", player.getHand(), game);
+			controller.lookAtCards("Memoricide Library", new CardsImpl(Zone.PICK, player.getLibrary().getCards(game)), game);
+			player.shuffleLibrary(game);
+		}
+		return true;
+	}
+
+	@Override
+	public MemoricideEffect copy() {
+		return new MemoricideEffect(this);
+	}
+	
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandry.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandry.java
new file mode 100644
index 0000000000..1c9eba2475
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandry.java
@@ -0,0 +1,133 @@
+/*
+ *  Copyright 2011 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.scarsofmirrodin;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Outcome;
+import mage.Constants.Rarity;
+import mage.Constants.Zone;
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.common.DiscardTargetCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.players.Player;
+import mage.target.TargetPlayer;
+import mage.target.common.TargetCardInHand;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class PainfulQuandry extends CardImpl<PainfulQuandry> {
+
+	public PainfulQuandry(UUID ownerId) {
+		super(ownerId, 73, "Painful Quandry", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}");
+		this.expansionSetCode = "SOM";
+		this.color.setBlack(true);
+		this.addAbility(new PainfulQuandryAbility());
+	}
+
+	public PainfulQuandry(final PainfulQuandry card) {
+		super(card);
+	}
+
+	@Override
+	public PainfulQuandry copy() {
+		return new PainfulQuandry(this);
+	}
+
+}
+
+class PainfulQuandryAbility extends TriggeredAbilityImpl<PainfulQuandryAbility> {
+
+	public PainfulQuandryAbility() {
+		super(Zone.BATTLEFIELD, new PainfulQuandryEffect());
+		this.addTarget(new TargetPlayer());
+	}
+	
+	public PainfulQuandryAbility(final PainfulQuandryAbility ability) {
+		super(ability);
+	}
+	
+	@Override
+	public PainfulQuandryAbility copy() {
+		return new PainfulQuandryAbility(this);
+	}
+
+	@Override
+	public boolean checkTrigger(GameEvent event, Game game) {
+		if (event.getType() == EventType.SPELL_CAST && game.getOpponents(controllerId).contains(event.getPlayerId())) {
+			this.getTargets().get(0).add(event.getPlayerId(), game);
+			return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public String getRule() {
+		return "Whenever an opponent casts a spell, that player loses 5 life unless he or she discards a card.";
+	}
+}
+
+class PainfulQuandryEffect extends OneShotEffect<PainfulQuandryEffect> {
+
+	public PainfulQuandryEffect() {
+		super(Outcome.Damage);
+		staticText = "player loses 5 life unless he or she discards a card";
+	}
+
+	public PainfulQuandryEffect(final PainfulQuandryEffect effect) {
+		super(effect);
+	}
+
+	@Override
+	public PainfulQuandryEffect copy() {
+		return new PainfulQuandryEffect(this);
+	}
+
+	@Override
+	public boolean apply(Game game, Ability source) {
+		Player player = game.getPlayer(source.getFirstTarget());
+		if (player != null) {
+			Cost cost = new DiscardTargetCost(new TargetCardInHand());
+			if (!cost.pay(game, player.getId(), player.getId(), false)) {
+				player.loseLife(5, game);
+			}
+			return true;
+		}
+		return false;
+	}
+
+}