diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 86f3a908a..d5afa60b9 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -11434,11 +11434,11 @@ type=Artifact
 name=Clockwork Avian
 abilities=flying
 auto=counter(1/0,4)
-auto=@combat(attacking) source(this):phaseaction[combatends] counter(1/0,-1)
-auto=@combat(blocking) source(this):phaseaction[combatends] counter(1/0,-1)
+auto=@combat(attacking) source(this):phaseaction[combatends once] counter(1/0,-1)
+auto=@combat(blocking) source(this):phaseaction[combatends once] counter(1/0,-1)
 auto={X}{T}:thisforeach(X) all(this) counter(1/0,1,,4) myUpkeepOnly
 text=Flying -- Clockwork Avian enters the battlefield with four +1/+0 counters on it. -- At end of combat, if Clockwork Avian attacked or blocked this combat, remove a +1/+0 counter from it. -- {X}, {T}: Put up to X +1/+0 counters on Clockwork Avian. This ability can't cause the total number of +1/+0 counters on Clockwork Avian to be greater than four. Activate this ability only during your upkeep.
-mana={5}
+mana={1}
 type=Artifact Creature
 subtype=Bird
 power=0
@@ -11447,8 +11447,8 @@ toughness=4
 [card]
 name=Clockwork Beast
 auto=counter(1/0,7)
-auto=@combat(attacking) source(this):phaseaction[combatends] counter(1/0,-1)
-auto=@combat(blocking) source(this):phaseaction[combatends] counter(1/0,-1)
+auto=@combat(attacking) source(this):phaseaction[combatends once] counter(1/0,-1)
+auto=@combat(blocking) source(this):phaseaction[combatends once] counter(1/0,-1)
 auto={X}{T}:thisforeach(X) all(this) counter(1/0,1,,7) myUpkeepOnly
 text=Clockwork Beast enters the battlefield with seven +1/+0 counters on it. -- At end of combat, if Clockwork Beast attacked or blocked this combat, remove a +1/+0 counter from it. -- {X}, {T}: Put up to X +1/+0 counters on Clockwork Beast. This ability can't cause the total number of +1/+0 counters on Clockwork Beast to be greater than seven. Activate this ability only during your upkeep.
 mana={6}
@@ -11460,8 +11460,8 @@ toughness=4
 [card]
 name=Clockwork Beetle
 auto=counter(1/1,2)
-auto=@combat(attacking) source(this):phaseaction[combatends] counter(1/1,-1)
-auto=@combat(blocking) source(this):phaseaction[combatends] counter(1/1,-1)
+auto=@combat(attacking) source(this):phaseaction[combatends once] counter(1/1,-1)
+auto=@combat(blocking) source(this):phaseaction[combatends once] counter(1/1,-1)
 text=Clockwork Beetle enters the battlefield with two +1/+1 counters on it. -- Whenever Clockwork Beetle attacks or blocks, remove a +1/+1 counter from it at end of combat.
 mana={1}
 type=Artifact Creature
@@ -11473,8 +11473,8 @@ toughness=0
 name=Clockwork Condor
 abilities=flying
 auto=counter(1/1,3)
-auto=@combat(attacking) source(this):phaseaction[combatends] counter(1/1,-1)
-auto=@combat(blocking) source(this):phaseaction[combatends] counter(1/1,-1)
+auto=@combat(attacking) source(this):phaseaction[combatends once] counter(1/1,-1)
+auto=@combat(blocking) source(this):phaseaction[combatends once] counter(1/1,-1)
 text=Flying -- Clockwork Condor enters the battlefield with three +1/+1 counters on it. -- Whenever Clockwork Condor attacks or blocks, remove a +1/+1 counter from it at end of combat.
 mana={4}
 type=Artifact Creature
@@ -11487,8 +11487,8 @@ name=Clockwork Dragon
 abilities=flying
 auto=counter(1/1,6)
 auto={3}:counter(1/1)
-auto=@combat(attacking) source(this):phaseaction[combatends] counter(1/1,-1)
-auto=@combat(blocking) source(this):phaseaction[combatends] counter(1/1,-1)
+auto=@combat(attacking) source(this):phaseaction[combatends once] counter(1/1,-1)
+auto=@combat(blocking) source(this):phaseaction[combatends once] counter(1/1,-1)
 text=Flying -- Clockwork Dragon enters the battlefield with six +1/+1 counters on it. -- Whenever Clockwork Dragon attacks or blocks, remove a +1/+1 counter from it at end of combat. -- {3}: Put a +1/+1 counter on Clockwork Dragon.
 mana={7}
 type=Artifact Creature
@@ -11525,8 +11525,8 @@ toughness=0
 name=Clockwork Steed
 auto=counter(1/0,4)
 auto=cantbeblockedby(creature[artifact])
-auto=@combat(attacking) source(this):phaseaction[combatends] counter(1/0,-1)
-auto=@combat(blocking) source(this):phaseaction[combatends] counter(1/0,-1)
+auto=@combat(attacking) source(this):phaseaction[combatends once] counter(1/0,-1)
+auto=@combat(blocking) source(this):phaseaction[combatends once] counter(1/0,-1)
 auto={X}{T}:thisforeach(X) all(this) counter(1/0,1,,4) myUpkeepOnly
 text=Clockwork Steed enters the battlefield with four +1/+0 counters on it. -- Clockwork Steed can't be blocked by artifact creatures. -- At end of combat, if Clockwork Steed attacked or blocked this combat, remove a +1/+0 counter from it. -- {X}, {T}: Put up to X +1/+0 counters on Clockwork Steed. This ability can't cause the total number of +1/+0 counters on Clockwork Steed to be greater than four. Activate this ability only during your upkeep.
 mana={4}
@@ -11539,8 +11539,8 @@ toughness=3
 name=Clockwork Swarm
 auto=counter(1/0,4)
 auto=cantbeblockedby(wall)
-auto=@combat(attacking) source(this):phaseaction[combatends] counter(1/0,-1)
-auto=@combat(blocking) source(this):phaseaction[combatends] counter(1/0,-1)
+auto=@combat(attacking) source(this):phaseaction[combatends once] counter(1/0,-1)
+auto=@combat(blocking) source(this):phaseaction[combatends once] counter(1/0,-1)
 auto={X}{T}:thisforeach(X) all(this) counter(1/0,1,,4) myUpkeepOnly
 auto={X}{T}:thisforeach(X) all(this) counter(1/0,1) && thisforeach(counter{1/0.1}>4) counter(1/0,-1) myUpkeepOnly
 text=Clockwork Swarm enters the battlefield with four +1/+0 counters on it. -- Clockwork Swarm can't be blocked by Walls. -- At end of combat, if Clockwork Swarm attacked or blocked this combat, remove a +1/+0 counter from it. -- {X}, {T}: Put up to X +1/+0 counters on Clockwork Swarm. This ability can't cause the total number of +1/+0 counters on Clockwork Swarm to be greater than four. Activate this ability only during your upkeep.
@@ -11555,8 +11555,8 @@ name=Clockwork Vorrac
 abilities=trample
 auto=counter(1/1,4)
 auto={T}:counter(1/1,1)
-auto=@combat(attacking) source(this):phaseaction[combatends] counter(1/1,-1)
-auto=@combat(blocking) source(this):phaseaction[combatends] counter(1/1,-1)
+auto=@combat(attacking) source(this):phaseaction[combatends once] counter(1/1,-1)
+auto=@combat(blocking) source(this):phaseaction[combatends once] counter(1/1,-1)
 text=Trample -- Clockwork Vorrac enters the battlefield with four +1/+1 counters on it. -- Whenever Clockwork Vorrac attacks or blocks, remove a +1/+1 counter from it at end of combat. -- {T}: Put a +1/+1 counter on Clockwork Vorrac.
 mana={5}
 type=Artifact Creature