diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index fb8a019ea..0a267e08b 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -52025,6 +52025,15 @@ mana={2}{R}
 type=Sorcery
 [/card]
 [card]
+name=Mark of Sakiko
+target=creature
+auto=@combatdamaged(player) from(mytgt):all(trigger[from]) thisforeach(variable{thatmuch}>0) add{G} doesntempty
+text=Enchant creature -- Enchanted creature has "Whenever this creature deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end."
+mana={1}{G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Mark of the Oni
 target=creature
 alias=1194
@@ -71799,6 +71808,16 @@ power=0
 toughness=0
 [/card]
 [card]
+name=Sakiko, Mother of Summer
+auto=@combatdamaged(player) from(creature|mybattlefield):all(trigger[from]) thisforeach(variable{thatmuch}>0) add{G} doesntempty
+text=Whenever a creature you control deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+mana={4}{G}{G}
+type=Legendary Creature
+subtype=Snake Shaman
+power=3
+toughness=3
+[/card]
+[card]
 name=Sakura-Tribe Elder
 auto={S}:moveTo(myBattlefield) and!(tap)! target(basic|mylibrary)
 text=Sacrifice Sakura-Tribe Elder: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library.
@@ -71819,6 +71838,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Sakura-Tribe Springcaller
+text=At the beginning of your upkeep, add {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
+auto=@each my upkeep:add{G} doesntempty
+mana={3}{G}
+type=Creature
+subtype=Snake Shaman
+power=2
+toughness=4
+[/card]
+[card]
 name=Salt Flats
 auto=tap
 auto={T}:Add{1}
@@ -76158,6 +76187,17 @@ text={T}: Add {B} to your mana pool. -- {B}, {T}: Target legendary creature gain
 type=Legendary Land
 [/card]
 [card]
+name=Shizuko, Caller of Autumn
+auto=@each my upkeep:add{G}{G}{G} doesntempty
+auto=@each opponent upkeep:add{G}{G}{G} opponent doesntempty
+text=At the beginning of each player's upkeep, that player adds {G}{G}{G} to his or her mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
+mana={1}{G}{G}
+type=Legendary Creature
+subtype=Snake Shaman
+power=2
+toughness=3
+[/card]
+[card]
 name=Shoal Serpent
 abilities=defender
 auto=@movedTo(land|myBattlefield):name(loses defender) -defender ueot
@@ -91969,6 +92009,25 @@ type=Sorcery
 subtype=Arcane
 [/card]
 [card]
+name=Upwelling
+auto=mypoolsave(red)
+auto=mypoolsave(green)
+auto=mypoolsave(blue)
+auto=mypoolsave(black)
+auto=mypoolsave(white)
+auto=mypoolsave(green)
+auto=mypoolsave(colorless)
+auto=opponentpoolsave(red)
+auto=opponentpoolsave(green)
+auto=opponentpoolsave(blue)
+auto=opponentpoolsave(black)
+auto=opponentpoolsave(white)
+auto=opponentpoolsave(colorless)
+text=Mana pools don't empty as steps and phases end.
+mana={3}{G}
+type=Enchantment
+[/card]
+[card]
 name=Ur-Drago
 abilities=first strike
 auto=lord(creature) -swampwalk
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index f8f00292c..90da21e94 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -10164,13 +10164,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Mark of Sakiko
-text=Enchant creature -- Enchanted creature has "Whenever this creature deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end."
-mana={1}{G}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Martyr of Ashes
 text={2}, Reveal X red cards from your hand, Sacrifice Martyr of Ashes: Martyr of Ashes deals X damage to each creature without flying.
 mana={R}
@@ -14886,24 +14879,6 @@ power=3
 toughness=1
 [/card]
 [card]
-name=Sakiko, Mother of Summer
-text=Whenever a creature you control deals combat damage to a player, add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
-mana={4}{G}{G}
-type=Legendary Creature
-subtype=Snake Shaman
-power=3
-toughness=3
-[/card]
-[card]
-name=Sakura-Tribe Springcaller
-text=At the beginning of your upkeep, add {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end.
-mana={3}{G}
-type=Creature
-subtype=Snake Shaman
-power=2
-toughness=4
-[/card]
-[card]
 name=Saltcrusted Steppe
 text={T}: Add {1} to your mana pool. -- {1}, {T}: Put a storage counter on Saltcrusted Steppe. -- {1}, Remove X storage counters from Saltcrusted Steppe: Add X mana in any combination of {G} and/or {W} to your mana pool.
 type=Land
@@ -15734,15 +15709,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Shizuko, Caller of Autumn
-text=At the beginning of each player's upkeep, that player adds {G}{G}{G} to his or her mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
-mana={1}{G}{G}
-type=Legendary Creature
-subtype=Snake Shaman
-power=2
-toughness=3
-[/card]
-[card]
 name=Shoe Tree
 mana={4}{G}
 type=Creature — Treefolk
@@ -19031,12 +18997,6 @@ text=Untaidake, the Cloud Keeper enters the battlefield tapped. -- {T}, Pay 2 li
 type=Legendary Land
 [/card]
 [card]
-name=Upwelling
-text=Mana pools don't empty as steps and phases end.
-mana={3}{G}
-type=Enchantment
-[/card]
-[card]
 name=Urborg Panther
 text={B}, Sacrifice Urborg Panther: Destroy target creature blocking Urborg Panther. -- Sacrifice a creature named Feral Shadow, a creature named Breathstealer, and Urborg Panther: Search your library for a card named Spirit of the Night and put that card onto the battlefield. Then shuffle your library.
 mana={2}{B}