diff --git a/forge-gui/res/cardsfolder/upcoming/mila_crafty_companion_lukka_wayward_bonder.txt b/forge-gui/res/cardsfolder/upcoming/mila_crafty_companion_lukka_wayward_bonder.txt
index 04e80221c39..3fb7c3e204c 100644
--- a/forge-gui/res/cardsfolder/upcoming/mila_crafty_companion_lukka_wayward_bonder.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mila_crafty_companion_lukka_wayward_bonder.txt
@@ -15,18 +15,15 @@ Name:Lukka, Wayward Bonder
 ManaCost:4 R R
 Types:Legendary Planeswalker Lukka
 Loyalty:5
-A:AB$ Discard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | NumCards$ 1 | Optional$ True | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw | SpellDescription$ You may discard a card. If you do, draw a card. If a creature card was discarded this way, draw an additional card.
-SVar:DBDraw:DB$ Draw | NumCards$ 1 | SubAbility$ DBDraw2
+A:AB$ Discard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 1 | Optional$ True | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw | SpellDescription$ You may discard a card. If you do, draw a card. If a creature card was discarded this way, draw an additional card.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBDraw2
 SVar:DBDraw2:DB$ Draw | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | RememberChanged$ True | SubAbility$ DBPump | SubAbility$ DBDelTrig | AILogic$ BeforeCombat | SpellDescription$ Return target creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Haste
-SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DBExile | TriggerDescription$ Exile it at the beginning of your next upkeep. | RememberObjects$ RememberedLKI | SubAbility$ DBCleanup
-SVar:DBExile:DB$ ChangeZone | Origin$ Battlefield | Defined$ DelayTriggerRememberedLKI | Destination$ Exile
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | GainControl$ True | SubAbility$ DBPump | RememberChanged$ True | AILogic$ BeforeCombat | SpellDescription$ Return target creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step.
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Permanent$ True | AtEOT$ Exile | SubAbility$ DBCleanup
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Lukka, Wayward Bonder | Image$ emblem_lukka_wayward_bonder | Triggers$ LukkaCreatureETB | SVars$ LukkaDmg | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with “Whenever a creature enters the battlefield under your control, it deals damage equal to its power to any target.”
 SVar:LukkaCreatureETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Command | Execute$ LukkaDmg | TriggerDescription$ Whenever a creature enters the battlefield under your control, it deals damage equal to its power to any target.
 SVar:LukkaDmg:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | DamageSource$ TriggeredCard
 SVar:X:TriggeredCard$CardPower
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Discard & Ability$Graveyard
 Oracle:[+1]: You may discard a card. If you do, draw a card. If a creature card was discarded this way, draw two cards instead.\n[-2]: Return target creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of your next upkeep.\n[-7]: You get an emblem with “Whenever a creature enters the battlefield under your control, it deals damage equal to its power to any target.”