diff --git a/res/cardsfolder/j/jinx.txt b/res/cardsfolder/j/jinx.txt
index 513615a26d7..ea08fac2919 100644
--- a/res/cardsfolder/j/jinx.txt
+++ b/res/cardsfolder/j/jinx.txt
@@ -2,8 +2,9 @@ Name:Jinx
 ManaCost:1 U
 Types:Instant
 A:SP$ ChooseType | Cost$ 1 U | Defined$ You | Type$ Basic Land | SubAbility$ DBAnimate | SpellDescription$ Target land becomes the basic land type of your choice until end of turn. Draw a card at the beginning of the next turn's upkeep.
-SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | NextUpkeep$ True
+SVar:DBAnimate:DB$ Animate | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ ChosenType | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | RemoveAllAbilities$ True | SubAbility$ DelTrigSlowtrip
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DrawSlowtrip:DB$Draw | NumCards$ 1 | Defined$ You
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jinx.jpg
 Oracle:Target land becomes the basic land type of your choice until end of turn.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/res/cardsfolder/j/jolt.txt b/res/cardsfolder/j/jolt.txt
index 71e72296eaa..9a224407f3d 100644
--- a/res/cardsfolder/j/jolt.txt
+++ b/res/cardsfolder/j/jolt.txt
@@ -1,8 +1,9 @@
 Name:Jolt
 ManaCost:2 U
 Types:Instant
-A:SP$ TapOrUntap | Cost$ 2 U | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SubAbility$ DBDraw | SpellDescription$ You may tap or untap target artifact, creature, or land. Draw a card at the beginning of the next turn's upkeep.
-SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1 | NextUpkeep$ True
+A:SP$ TapOrUntap | Cost$ 2 U | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SubAbility$ DelTrigSlowtrip | SpellDescription$ You may tap or untap target artifact, creature, or land. Draw a card at the beginning of the next turn's upkeep.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DrawSlowtrip:DB$Draw | NumCards$ 1 | Defined$ You
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jolt.jpg
 Oracle:You may tap or untap target artifact, creature, or land.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/res/cardsfolder/k/krovikan_fetish.txt b/res/cardsfolder/k/krovikan_fetish.txt
index c6065d6aa4b..64fe47b4a95 100644
--- a/res/cardsfolder/k/krovikan_fetish.txt
+++ b/res/cardsfolder/k/krovikan_fetish.txt
@@ -4,8 +4,9 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1 | NextUpkeep$ True
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DrawSlowtrip:DB$Draw | NumCards$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/krovikan_fetish.jpg
 Oracle:Enchant creature\nWhen Krovikan Fetish enters the battlefield, draw a card at the beginning of the next turn's upkeep.\nEnchanted creature gets +1/+1.
 SetInfo:ICE Common
diff --git a/res/cardsfolder/k/krovikan_plague.txt b/res/cardsfolder/k/krovikan_plague.txt
index f9ca2e14220..947381bc0c9 100644
--- a/res/cardsfolder/k/krovikan_plague.txt
+++ b/res/cardsfolder/k/krovikan_plague.txt
@@ -3,8 +3,9 @@ ManaCost:2 B
 Types:Enchantment Aura
 K:Enchant non-Wall creature you control
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature.nonWall+YouCtrl | TgtPrompt$ Select target non-Wall creature you control | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
-SVar:TrigDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
+SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
+SVar:DrawSlowtrip:DB$Draw | NumCards$ 1 | Defined$ You
 A:AB$DealDamage | Cost$ tapXType<1/Creature.EnchantedBy/Enchanted Creature> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SubAbility$ DBPutCounter | CostDesc$ Tap enchanted creature: | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Put a -0/-1 counter on enchanted creature. Activate this ability only if enchanted creature is untapped.
 SVar:DBPutCounter:DB$PutCounter | Defined$ Enchanted | CounterType$ M0M1 | CounterNum$ 1
 SVar:RemAIDeck:True