diff --git a/.gitattributes b/.gitattributes
index 12ddd1def9f..e46cdc734be 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -350,6 +350,7 @@ res/cardsfolder/ballynock_trapper.txt -text svneol=native#text/plain
 res/cardsfolder/ballyrush_banneret.txt -text svneol=native#text/plain
 res/cardsfolder/baloth_woodcrasher.txt -text svneol=native#text/plain
 res/cardsfolder/balshan_collaborator.txt -text svneol=native#text/plain
+res/cardsfolder/balshan_griffin.txt -text svneol=native#text/plain
 res/cardsfolder/baneslayer_angel.txt -text svneol=native#text/plain
 res/cardsfolder/banishing_knack.txt -text svneol=native#text/plain
 res/cardsfolder/bant_battlemage.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/amugaba.txt b/res/cardsfolder/amugaba.txt
index 90102eef216..11dab275924 100644
--- a/res/cardsfolder/amugaba.txt
+++ b/res/cardsfolder/amugaba.txt
@@ -4,6 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:6/6
 K:Flying
+A:AB$Bounce|Cost$2 U Discard<1/Any>|Destination$Hand|SpellDescription$Return CARDNAME to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/amugaba.jpg
 End
diff --git a/res/cardsfolder/arcanis_the_omnipotent.txt b/res/cardsfolder/arcanis_the_omnipotent.txt
index 14a8cd48915..8cde5f8d1b0 100644
--- a/res/cardsfolder/arcanis_the_omnipotent.txt
+++ b/res/cardsfolder/arcanis_the_omnipotent.txt
@@ -3,6 +3,8 @@ ManaCost:3 U U U
 Types:Legendary Creature Wizard
 Text:no text
 PT:3/4
+A:AB$Draw|Cost$T|NumCards$3|SpellDescription$Draw three cards.
+A:AB$Bounce|Cost$U U U|Destination$Hand|SpellDescription$Return CARDNAME to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcanis_the_omnipotent.jpg
 End
diff --git a/res/cardsfolder/balshan_griffin.txt b/res/cardsfolder/balshan_griffin.txt
new file mode 100644
index 00000000000..fa977efda0d
--- /dev/null
+++ b/res/cardsfolder/balshan_griffin.txt
@@ -0,0 +1,10 @@
+Name:Balshan Griffin
+ManaCost:3 U U
+Types:Creature Griffin
+Text:no text
+PT:3/2
+K:Flying
+A:AB$Bounce|Cost$2 U Discard<1/Any>|Destination$Hand|SpellDescription$Return Amugaba to its owner's hand.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/balshan_griffin.jpg
+End
diff --git a/res/cardsfolder/blinking_spirit.txt b/res/cardsfolder/blinking_spirit.txt
index 08402300e41..d1f642d92ef 100644
--- a/res/cardsfolder/blinking_spirit.txt
+++ b/res/cardsfolder/blinking_spirit.txt
@@ -3,6 +3,7 @@ ManaCost:3 W
 Types:Creature Spirit	
 Text:no text
 PT:2/2
+A:AB$Bounce|Cost$0|Destination$Hand|SpellDescription$Return CARDNAME to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blinking_spirit.jpg
 End
diff --git a/res/cardsfolder/crovax_ascendant_hero.txt b/res/cardsfolder/crovax_ascendant_hero.txt
index 05cf809de9f..077c04d8797 100644
--- a/res/cardsfolder/crovax_ascendant_hero.txt
+++ b/res/cardsfolder/crovax_ascendant_hero.txt
@@ -3,8 +3,9 @@ ManaCost:4 W W
 Types:Legendary Creature Human
 Text:no text
 PT:4/4
-K:StaticEffect:Play:All Permanents:PTBonus/1/1:Color.white!NotSelf:Other white creatures get +1/+1.
-K:StaticEffect:Play:All Permanents:PTBonus/-1/-1:NonColor.white:Nonwhite creatures get -1/-1.
+K:stPumpAll:Creature.White+Other:1/1:No Condition:Other white creatures get +1/+1.
+K:stPumpAll:Creature.nonWhite:-1/-1:No Condition:Nonwhite creatures get -1/-1.
+A:AB$Bounce|Cost$PayLife<2>|Destination$Hand|SpellDescription$Return CARDNAME to its owner's hand.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crovax_ascendant_hero.jpg
diff --git a/res/cardsfolder/selenia_dark_angel.txt b/res/cardsfolder/selenia_dark_angel.txt
index 16d528f44c9..751caab49c9 100644
--- a/res/cardsfolder/selenia_dark_angel.txt
+++ b/res/cardsfolder/selenia_dark_angel.txt
@@ -4,6 +4,7 @@ Types:Legendary Creature Angel
 Text:no text
 PT:3/3
 K:Flying
+A:AB$Bounce|Cost$PayLife<2>|Destination$Hand|SpellDescription$Return CARDNAME to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selenia_dark_angel.jpg
 End
diff --git a/res/cardsfolder/wilt_leaf_liege.txt b/res/cardsfolder/wilt_leaf_liege.txt
index ddb5a37f4d0..9da05e79d70 100644
--- a/res/cardsfolder/wilt_leaf_liege.txt
+++ b/res/cardsfolder/wilt_leaf_liege.txt
@@ -4,8 +4,8 @@ Types:Creature Elf Knight
 Text:no text
 PT:4/4
 K:If a spell or ability an opponent controls causes you to discard CARDNAME, put it onto the battlefield instead of putting it into your graveyard.
-K:StaticEffect:Play:Permanents you Control:PTBonus/1/1:Color.green!NotSelf:Other green creatures you control get +1/+1.
-K:StaticEffect:Play:Permanents you Control:PTBonus/1/1:Color.white!NotSelf:Other white creatures you control get +1/+1.
+K:stPumpAll:Creature.Green+Other+YouCtrl:1/1:No Condition:Other green creatures you control get +1/+1.
+K:stPumpAll:Creature.White+Other+YouCtrl:1/1:No Condition:Other white creatures you control get +1/+1.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wilt_leaf_liege.jpg
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 5598c8d9686..40bcebbf368 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -7523,6 +7523,7 @@ public class CardFactory_Creatures {
             ability.setBeforePayMana(runtime);
         }//*************** END ************ END **************************
         
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Amugaba")) {
             
@@ -7560,6 +7561,7 @@ public class CardFactory_Creatures {
             card.addSpellAbility(ability);
             ability.setBeforePayMana(runtime);
         }//*************** END ************ END **************************
+        */
         
         //*************** START *********** START **************************
         else if(cardName.equals("Subterranean Spirit")) {