diff --git a/forge-gui/res/cardsfolder/upcoming/gilraen_dunedain_protector.txt b/forge-gui/res/cardsfolder/upcoming/gilraen_dunedain_protector.txt
index 454a9097b7f..daaf550ef42 100644
--- a/forge-gui/res/cardsfolder/upcoming/gilraen_dunedain_protector.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gilraen_dunedain_protector.txt
@@ -3,9 +3,12 @@ ManaCost:2 W
 Types:Legendary Creature Human Noble
 PT:2/3
 A:AB$ ChangeZone | Cost$ 2 T | ValidTgts$ Creature.Other+YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select another target creature you control | SubAbility$ DBReturn | SpellDescription$ Exile another target creature you control. You may return that card to the battlefield under its owner's control. If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Targeted | Origin$ All | Optional$ True | Destination$ Battlefield | RememberChanged$ True | SubAbility$ DBDelayedTrigger
-SVar:DBDelayedTrigger:DB$ DelayedTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | RememberObjects$ RememberedCard | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | SubAbility$ DBCleanup | SpellDescription$ If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
-SVar:TrigReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | WithCountersType$ Lifelink,Vigilance
+SVar:DBReturn:DB$ ChangeZone | Defined$ Targeted | Origin$ All | Optional$ True | Destination$ Battlefield | SubAbility$ DBDelayedTrigger
+SVar:DBDelayedTrigger:DB$ DelayedTrigger | RememberObjects$ Targeted | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | SpellDescription$ If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
+SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Exile | RememberChanged$ True | Destination$ Battlefield | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ ETBCounters | RememberObjects$ Remembered | ExileOnMoved$ Stack | SubAbility$ DBCleanup
+SVar:ETBCounters:Event$ Moved | ReplacementResult$ Updated | ActiveZones$ Command | Destination$ Battlefield | ValidCard$ Card.IsRemembered | ReplaceWith$ AddExtraCounter | Description$ return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterTypes$ Vigilance,Lifelink | CounterNum$ 1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Counters|LifeGain
 Oracle:{2}, {T}: Exile another target creature you control. You may return that card to the battlefield under its owner's control. If you don't, at the beginning of the next end step, return that card to the battlefield under its owner's control with a vigilance counter and a lifelink counter on it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mirkwood_trapper.txt b/forge-gui/res/cardsfolder/upcoming/mirkwood_trapper.txt
index 077fa75a6d7..7016e78cc29 100644
--- a/forge-gui/res/cardsfolder/upcoming/mirkwood_trapper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mirkwood_trapper.txt
@@ -2,9 +2,9 @@ Name:Mirkwood Trapper
 ManaCost:1 G U
 Types:Creature Elf Scout
 PT:1/4
-T:Mode$ AttackersDeclared | ValidCard$ Creature | Attacked$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a player attacks you, target attacking creature gets -2/-0 until end of turn.
+T:Mode$ AttackersDeclared | AttackedTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a player attacks you, target attacking creature gets -2/-0 until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking | NumAtt$ -2 | IsCurse$ True
-T:Mode$ AttackersDeclared | ValidAttackers$ Creature.YouCtrl | AttackedTarget$ Player.Other | Execute$ TrigChoose | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player attacks, if they aren't attacking you, that player chooses an attacking creature. It gets +2/+0 until end of turn.
+T:Mode$ AttackersDeclared | AttackedTarget$ Player.Other | Execute$ TrigChoose | NoResolvingCheck$ True | IsPresent$ Creature.attackingYou | PresentCompare$ EQ0 | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player attacks, if they aren't attacking you, that player chooses an attacking creature. It gets +2/+0 until end of turn.
 SVar:TrigChoose:DB$ ChooseCard | Chooser$ TriggeredAttackingPlayer | Choices$ Creature.attacking | SubAbility$ DBPump 
 SVar:DBPump:DB$ Pump | Defined$ ChosenCard | NumAtt$ +2 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True