diff --git a/.gitattributes b/.gitattributes
index eae1f33d289..84ba73d25e2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8352,6 +8352,7 @@ res/quest/decks/Marge[!!-~]Simpson[!!-~]2.dck -text
 res/quest/decks/Morpheus[!!-~]3.dck -text
 res/quest/decks/Mr[!!-~]Slate[!!-~]2.dck -text
 res/quest/decks/Mr[!!-~]Slate[!!-~]3.dck -text
+res/quest/decks/Nagini[!!-~]2.dck -text
 res/quest/decks/Napoleon[!!-~]3.dck -text
 res/quest/decks/Ned[!!-~]Flanders[!!-~]1.dck -text
 res/quest/decks/Ned[!!-~]Flanders[!!-~]2.dck -text
diff --git a/res/quest/decks/Buffy 1.dck b/res/quest/decks/Buffy 1.dck
index 2469429a76f..0d18b14f944 100644
--- a/res/quest/decks/Buffy 1.dck	
+++ b/res/quest/decks/Buffy 1.dck	
@@ -1,32 +1,43 @@
-Buffy 1
-[general]
-constructed
-[main]
-3 Aggressive Urge
-4 Taiga
-1 Jabari's Banner
-2 Blightspeaker
-3 Boggart Ram-Gang
-2 Threaten
-1 Sorceress Queen
-2 Sengir Vampire
-1 Flying Carpet
-4 Bayou
-1 Regrowth
-2 Bog Imp
-1 Moss Diamond
-1 Arrogant Vampire
-3 Swamp
-3 Sengir Bats
-3 Wildsize
-3 Dakmor Bat
-3 Forest
-4 Badlands
-2 Stone-Throwing Devils
-2 Animate Dead
-1 Fire Diamond
-1 Charcoal Diamond
-2 Raise Dead
-3 Smoldering Butcher
-2 Mountain
-[sideboard]
+Buffy 1
+[general]
+constructed
+[main]
+1 Blind Creeper|5DN
+1 Skulking Knight|TSP
+1 Withered Wretch|TSB
+1 Grixis Slavedriver|CFX
+1 Undead Warchief|TSB
+1 Smokespew Invoker|LGN
+19 Swamp|MBS
+1 Null Champion|ROE
+1 Grave Defiler|APC
+1 Wretched Anurid|ONS
+1 Grasp of Darkness|SOM
+4 Verdant Catacombs|ZEN
+1 Unholy Grotto|ONS
+1 Spined Basher|ONS
+1 Legions of Lim-Dul|ICE
+1 Stromgald Crusader|CSP
+1 Dreg Reaver|ALA
+1 Dross Crocodile|10E
+1 Cackling Fiend|USG
+1 Rank and File|ULG
+1 Festering Goblin|10E
+1 Nested Ghoul|MBS
+1 Infectious Horror|CFX
+1 Anurid Murkdiver|ONS
+1 Mass of Ghouls|10E
+1 Aphetto Vulture|ONS
+1 Cadaverous Knight|MIR
+1 Tresserhorn Skyknight|CSP
+1 Waning Wurm|PLC
+2 Cruel Revival|ONS
+1 Feeding Frenzy|ONS
+1 Spineless Thug|10E
+1 Phyrexian Bloodstock|PLS
+1 Infernal Caretaker|LGN
+1 Vengeful Dead|SCG
+1 Bog Raiders|M11
+1 Creakwood Ghoul|EVE
+1 Cyclopean Mummy|LEG
+[sideboard]
diff --git a/res/quest/decks/Buffy 2.dck b/res/quest/decks/Buffy 2.dck
index 1566d9d05ae..193bce6fe38 100644
--- a/res/quest/decks/Buffy 2.dck	
+++ b/res/quest/decks/Buffy 2.dck	
@@ -1,31 +1,40 @@
-Buffy 2
-[general]
-constructed
-[main]
-4 Taiga
-3 Harmonize
-3 Boggart Ram-Gang
-2 Threaten
-1 Sorceress Queen
-2 Hypnotic Specter
-1 Beacon of Unrest
-2 Sengir Vampire
-3 Cinderbones
-4 Bayou
-1 Demonic Tutor
-1 Foxfire Oak
-1 Regrowth
-4 Ostracize
-1 Mirri the Cursed
-1 Moss Diamond
-3 Swamp
-4 Distress
-3 Sickle Ripper
-3 Dakmor Bat
-3 Forest
-4 Badlands
-1 Fire Diamond
-1 Charcoal Diamond
-2 Scuzzback Scrapper
-2 Mountain
-[sideboard]
+Buffy 2
+[general]
+constructed
+[main]
+1 Skulking Knight|TSP
+1 Withered Wretch|TSB
+1 Grixis Slavedriver|CFX
+1 Undead Warchief|TSB
+1 Cemetery Reaper|M10
+1 Smokespew Invoker|LGN
+19 Swamp|MBS
+2 Zombie Master|6ED
+2 Null Champion|ROE
+1 Wretched Anurid|ONS
+1 Tendrils of Corruption|M10
+2 Grasp of Darkness|SOM
+4 Verdant Catacombs|ZEN
+1 Unholy Grotto|ONS
+1 Spined Basher|ONS
+1 Noxious Ghoul|LGN
+1 Stromgald Crusader|CSP
+1 Dreg Reaver|ALA
+1 Dross Crocodile|10E
+1 Nefashu|SCG
+2 Festering Goblin|10E
+1 Anurid Murkdiver|ONS
+1 Nested Ghoul|MBS
+1 Infectious Horror|CFX
+1 Mass of Ghouls|10E
+1 Aphetto Vulture|ONS
+1 Grave Pact|10E
+1 Cadaverous Knight|MIR
+2 Soulless One|ONS
+2 Cruel Revival|ONS
+1 Feeding Frenzy|ONS
+1 Spineless Thug|10E
+1 Call to the Grave|SCG
+1 Lim-Dul the Necromancer|TSP
+1 Lord of the Undead|PLS
+[sideboard]
diff --git a/res/quest/decks/Buffy 3.dck b/res/quest/decks/Buffy 3.dck
index d3e6f3dfa38..24159d0d475 100644
--- a/res/quest/decks/Buffy 3.dck	
+++ b/res/quest/decks/Buffy 3.dck	
@@ -2,27 +2,23 @@ Buffy 3
 [general]
 constructed
 [main]
-4 Polluted Delta
-4 Crumbling Necropolis
-4 Underground Sea
-4 Volcanic Island
-2 Badlands
-2 Scalding Tarn
-2 Bloodstained Mire
-1 Mox Jet
-1 Mox Ruby
-1 Mox Sapphire
-4 Concentrate
-4 Damnation
-4 Terminate
-4 Counterspell
-3 Jace Beleren
-3 Chandra Nalaar
-3 Nicol Bolas, Planeswalker
-3 Cruel Ultimatum
-2 Grave Titan
-2 Frost Titan
-1 Ancestral Recall
-1 Timetwister
-1 Time Walk
+1 Unholy Grotto|ONS
+1 Graveborn Muse|10E
+1 Bad Moon|TSB
+2 Stromgald Crusader|CSP
+3 Undead Warchief|TSB
+1 Festering Goblin|10E
+3 Sarcomancy|TMP
+3 Cemetery Reaper|M10
+3 Grave Titan|M11
+1 Grave Pact|10E
+19 Swamp|MBS
+4 Death Baron|ALA
+3 Grave Defiler|APC
+3 Cruel Revival|ONS
+1 Feeding Frenzy|ONS
+3 Tendrils of Corruption|M10
+3 Grasp of Darkness|SOM
+4 Verdant Catacombs|ZEN
+1 Lord of the Undead|PLS
 [sideboard]
diff --git a/res/quest/decks/Nagini 2.dck b/res/quest/decks/Nagini 2.dck
new file mode 100644
index 00000000000..ec3c7fd8db5
--- /dev/null
+++ b/res/quest/decks/Nagini 2.dck	
@@ -0,0 +1,27 @@
+Nagini 2
+[general]
+constructed
+[main]
+2 Tangle Asp|5DN
+2 River Boa|ZEN
+2 Mire Boa|PLC
+2 Ohran Viper|CSP
+2 Kashi-Tribe Elite|SOK
+2 Orochi Ranger|CHK
+2 Sosuke's Summons|BOK
+2 Kashi-Tribe Warriors|CHK
+2 Death-Hood Cobra|NPH
+1 Overwhelming Stampede|M11
+1 Needle Storm|9ED
+2 Stonewood Invocation|TSP
+2 Seshiro the Anointed|CHK
+2 Sakura-Tribe Elder|CHK
+1 Sachi, Daughter of Seshiro|CHK
+1 Boa Constrictor|MMQ
+2 Hornet Cobra|LEG
+20 Forest|MBS
+2 Kashi-Tribe Reaver|CHK
+1 Whirlwind|S99
+4 Verdant Catacombs|ZEN
+3 Sosuke, Son of Seshiro|CHK
+[sideboard]
diff --git a/res/quest/medium.txt b/res/quest/medium.txt
index 010f9ea7a02..36efa7a9c76 100644
--- a/res/quest/medium.txt
+++ b/res/quest/medium.txt
@@ -38,6 +38,7 @@ King Kong 2
 Kojak 2
 Magnum 2
 Marge Simpson 2
+Nagini 2
 Ned Flanders 2
 Oberon 2
 Pebbles Flintstone 2