diff --git a/res/cardsfolder/s/serra_avenger.txt b/res/cardsfolder/s/serra_avenger.txt
index dfc45bbc234..36617633946 100644
--- a/res/cardsfolder/s/serra_avenger.txt
+++ b/res/cardsfolder/s/serra_avenger.txt
@@ -1,10 +1,11 @@
 Name:Serra Avenger
 ManaCost:W W
 Types:Creature Angel
-Text:You can't play Serra Avenger during your first, second, or third turns of the game.
 PT:3/3
 K:Flying
 K:Vigilance
+S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ All | CheckSVar$ X | SVarCompare$ LE3 | Description$ You can't play Serra Avenger during your first, second, or third turns of the game.
+SVar:X:Count$YourTurns
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/tsp/en-us/card113519.jpg
 SetInfo:M13|Rare|http://magiccards.info/scans/en/m13/33.jpg
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 7108d26e104..76c840003d1 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -1920,6 +1920,15 @@ public class CardFactoryUtil {
             }
         }
 
+        if (sq[0].equals("YourTurns")) {
+            return CardFactoryUtil.doXMath(cardController.getTurn(), m, c);
+        }
+
+        if (sq[0].equals("TotalTurns")) {
+            // Sorry for the Singleton use, replace this once this function has game passed into it
+            return CardFactoryUtil.doXMath(Singletons.getModel().getGame().getPhaseHandler().getTurn(), m, c);
+        }
+
         // Generic Zone-based counting
         // Count$QualityAndZones.Subquality
 
diff --git a/src/main/java/forge/card/spellability/SpellPermanent.java b/src/main/java/forge/card/spellability/SpellPermanent.java
index 8bc7d6379c0..ed875842c93 100644
--- a/src/main/java/forge/card/spellability/SpellPermanent.java
+++ b/src/main/java/forge/card/spellability/SpellPermanent.java
@@ -260,23 +260,6 @@ public class SpellPermanent extends Spell {
 
     } // Spell_Permanent()
 
-    /** {@inheritDoc} */
-    @Override
-    public boolean canPlay() {
-        final Card source = this.getSourceCard();
-
-        final Player turn = Singletons.getModel().getGame().getPhaseHandler().getPlayerTurn();
-
-        if (source.getName().equals("Serra Avenger")) {
-            if (turn.equals(source.getController()) && (turn.getTurn() <= 3)) {
-                return false;
-            }
-        }
-
-        // Flash handled by super.canPlay
-        return super.canPlay();
-    }
-
     /** {@inheritDoc} */
     @Override
     public boolean canPlayAI() {