diff --git a/res/cards.txt b/res/cards.txt
index b5e8b7b7601..12736e811cb 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -14508,7 +14508,6 @@ B B
 Sorcery
 no text
 spDiscardTgt:AtRandom:2:Target player discards two cards at random.:Hymn to Tourach - target player discards cards
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/fe/en-us/card1849.jpg
 
@@ -17540,6 +17539,7 @@ Legendary Creature Angel
 Activated abilities of creatures your opponents control can't be activated.
 3/4
 Flying
+SVar:PlayMain1:TRUE
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/linvala_keeper_of_silence.jpg
 
@@ -17577,6 +17577,7 @@ Legendary Creature Human Soldier
 Liu Bei, Lord of Shu gets +2/+2 as long as you control a permanent named Guan Yu, Sainted Warrior or a permanent named Zhang Fei, Fierce Warrior.
 2/4
 Horsemanship
+SVar:BuffedBy:Permanent.named
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/liu_bei_lord_of_shu.jpg
 
@@ -18259,6 +18260,7 @@ Magus of the Tabernacle
 Creature Human Wizard
 All creatures have "At the beginning of your upkeep, sacrifice this creature unless you pay 1."
 2/6
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_tabernacle.jpg
 
@@ -30520,6 +30522,7 @@ The Tabernacle at Pendrell Vale
 no cost
 Legendary Land
 All creatures have "At the beginning of your upkeep, destroy this creature unless you pay 1."
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/the_tabernacle_at_pendrell_vale.jpg
 
diff --git a/res/quest/decks/R2-D2 3.dck b/res/quest/decks/R2-D2 3.dck
index 0b25790c551..7299f8f35d3 100644
--- a/res/quest/decks/R2-D2 3.dck	
+++ b/res/quest/decks/R2-D2 3.dck	
@@ -1,23 +1,22 @@
-R2-D2 3
-[general]
-constructed
-[main]
-2 Disenchant
-3 Evacuation
-4 Aven Envoy
-1 Mox Sapphire
-7 Plains
-3 Black Vise
-3 Darksteel Ingot
-7 Island
-3 Echoing Truth
-4 Ornithopter
-3 Boomerang
-1 Mox Pearl
-3 Words of Wisdom
-4 Tundra
-3 Repulse
-3 Howling Mine
-3 Regress
-3 Man-o'-War
-[sideboard]
+R2-D2 3
+[general]
+constructed
+[main]
+20 Island
+1 The Tabernacle at Pendrell Vale
+1 Mox Sapphire
+4 Evacuation
+4 Upheaval
+4 Trinket Mage
+4 Black Vise
+1 Echoing Truth
+3 Boomerang
+1 Repulse
+4 Hoodwink
+3 Words of Wisdom
+1 Ancestral Recall
+4 Vision Skeins
+3 Howling Mine
+1 Remand
+1 Frozen AEther
+[sideboard]