diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index c11da5943..7fd989400 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -106336,7 +106336,8 @@ toughness=6
 [/card]
 [card]
 name=Simoon
-auto=damage:1 all(creature|opponentBattlefield)
+target=opponent
+auto=damage:1 all(creature|targetedpersonsbattlefield)
 text=Simoon deals 1 damage to each creature target opponent controls.
 mana={R}{G}
 type=Instant
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 91b885f41..1eb729b85 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -386,7 +386,10 @@ int AbilityFactory::parseCastRestrictions(MTGCardInstance * card, Player * playe
                 for(unsigned int gy = 0;gy < grave->cardsSeenThisTurn.size();gy++)
                 {
                     MTGCardInstance * checkCard = grave->cardsSeenThisTurn[gy];
-                    if(checkCard->isCreature())
+                    if(checkCard->isCreature() &&
+                        ((checkCard->previousZone == checkCurrent->game->battlefield)||
+                        (checkCard->previousZone == checkCurrent->opponent()->game->battlefield))//died from battlefield
+                        )
                     {
                         isMorbid = true;
                         break;
@@ -398,7 +401,26 @@ int AbilityFactory::parseCastRestrictions(MTGCardInstance * card, Player * playe
             if(!isMorbid)
                 return 0;
         }
-        
+        check = restriction[i].find("zerodead");
+        if(check != string::npos)//returns true if zero
+        {
+            bool hasDeadCreature = false;
+            Player * checkCurrent = card->controller();
+            MTGGameZone * grave = checkCurrent->game->graveyard;
+            for(unsigned int gy = 0;gy < grave->cardsSeenThisTurn.size();gy++)
+            {
+                MTGCardInstance * checkCard = grave->cardsSeenThisTurn[gy];
+                if(checkCard->isCreature() &&
+                    ((checkCard->previousZone == checkCurrent->game->battlefield))//died from your battlefield
+                    )
+                {
+                    hasDeadCreature = true;
+                    break;
+                }
+            }
+            if(hasDeadCreature)
+                return 0;
+        }
         //Ensnaring Bridge
         check = restriction[i].find("powermorethanopponenthand");
         if (check != string::npos)//for opponent creatures