diff --git a/forge-gui/res/cardsfolder/upcoming/daredevil_dragster.txt b/forge-gui/res/cardsfolder/upcoming/daredevil_dragster.txt
index 909f3467664..f1f80ae990f 100644
--- a/forge-gui/res/cardsfolder/upcoming/daredevil_dragster.txt
+++ b/forge-gui/res/cardsfolder/upcoming/daredevil_dragster.txt
@@ -1,12 +1,12 @@
 Name:Daredevil Dragster
-ManaCost:2
+ManaCost:3
 Types:Artifact Vehicle
 PT:4/4
-T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | IsPresent$ Card.Self+attackedThisCombat,Card.blocking+Self | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At end of combat, if CARDNAME attacked or blocked this combat, put a velocity counter on it. Then if it has two or more velocity counters on it, sacrifice it and draw two cards.
+T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | IsPresent$ Card.Self+attackedThisCombat,Card.Self+blockedThisCombat | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At end of combat, if CARDNAME attacked or blocked this combat, put a velocity counter on it. Then if it has two or more velocity counters on it, sacrifice it and draw two cards.
 SVar:TrigPutCounter:DB$PutCounter | CounterType$ VELOCITY | CounterNum$ 1 | SubAbility$ DBSac
-SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionCheckSVar$ X | References$ X | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ 2
-SVar:X:Count$Valid Card.Self+counters_GE2_VELOCITY
+SVar:DBSac:DB$ Sacrifice | SacValid$ Self | RememberSacrificed$ True | ConditionPresent$ Card.Self+counters_GE2_VELOCITY | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 2 | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 K:Crew:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daredevil_dragster.jpg
 Oracle:At end of combat, if Daredevil Dragster attacked or blocked this combat, put a velocity counter on it. Then if it has two or more velocity counters on it, sacrifice it and draw two cards.\nCrew 2 (Tap any number of creatures you control with total power 2 or more: This Vehicle becomes an artifact creature until end of turn.)