diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/xira_boss_effect.txt b/forge-gui/res/adventure/Shandalar/custom_cards/xira_boss_effect.txt
index 2b062a3d968..fd8f5dd7494 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/xira_boss_effect.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/xira_boss_effect.txt
@@ -3,9 +3,10 @@ ManaCost:no cost
 Colors:black,green,red
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Insect.YouCtrl | EffectZone$ Command | AddPower$ 1 | AddToughness 1 | AddKeyword$ Double Team | Description$ Nontoken insects you control have +1/+1 and Double Team.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ PutCounterAll | TriggerDescription$ At the beginning of your upkeep, put an egg counter on each creature you don't control without an egg counter on it.
-SVar:PutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.counters_LT1_EGG+OppCtrl | CounterType$ EGG| CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | TriggerZones$ Command | Destination$ Graveyard | ValidCard$ Creature.counters_GE1_EGG+OppCtrl | Execute$ TrigDraw | TriggerDescription$ Whenever a creature with an egg counter on it dies, draw a card and create a 1/1 black Insect creature token with flying.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ PutCounterAll | TriggerDescription$ At the beginning of your upkeep, put an egg counter on each nontoken creature.
+SVar:PutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.nonToken | CounterType$ EGG | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | TriggerZones$ Command | Destination$ Graveyard | ValidCard$ Creature.counters_GE1_EGG+OppCtrl | Execute$ TrigDraw | TriggerDescription$ Whenever a creature with an egg counter on it dies, draw a card and create X 1/1 black Insect creature token with flying where X is the amount of Egg counters on that creature.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenScript$ b_1_1_insect_flying
-Oracle:Nontoken insects you control have +1/+1 and Double Team\nAt the beginning of your upkeep, put an egg counter on each creature you don't control without an egg counter on it.\nWhen a creature with an egg counter dies,  draw a card and create a 1/1 black Insect creature token with flying. 
\ No newline at end of file
+SVar:DBToken:DB$ Token | TokenScript$ b_1_1_insect_flying | TokenNum$ X 
+SVar:X:TriggeredCard$CardCounters.EGG
+Oracle:Nontoken insects you control have +1/+1 and Double Team\nAt the beginning of your upkeep, put an egg counter on each creature you don't control without an egg counter on it.\nWhen a creature with an egg counter dies,  draw a card and create a 1/1 black Insect creature token with flying.