diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 8d0a204ab..50ecfaa5d 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -11182,7 +11182,7 @@ abilities=flying
 auto=counter(1/0,4)
 auto=@attacking(this):phaseaction[combatends] counter(1/0,-1)
 auto=@blocking(this):phaseaction[combatends] counter(1/0,-1)
-auto={X}{T}:thisforeach(X) all(this) counter(1/0,1) && thisforeach(counter{1/0.1}>4) counter(1/0,-1) myUpkeepOnly
+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}
 type=Artifact Creature
@@ -11192,7 +11192,10 @@ toughness=4
 [/card]
 [card]
 name=Clockwork Beast
-alias=1101
+auto=counter(1/0,7)
+auto=@attacking(this):phaseaction[combatends] counter(1/0,-1)
+auto=@blocking(this):phaseaction[combatends] 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}
 type=Artifact Creature
@@ -11203,8 +11206,8 @@ toughness=4
 [card]
 name=Clockwork Beetle
 auto=counter(1/1,2)
-auto=@attacking(this):phaseaction[combatends] counter(1/0,-1)
-auto=@blocking(this):phaseaction[combatends] counter(1/0,-1)
+auto=@attacking(this):phaseaction[combatends] counter(1/1,-1)
+auto=@blocking(this):phaseaction[combatends] 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
@@ -11216,8 +11219,8 @@ toughness=0
 name=Clockwork Condor
 abilities=flying
 auto=counter(1/1,3)
-auto=@attacking(this):phaseaction[combatends] counter(1/0,-1)
-auto=@blocking(this):phaseaction[combatends] counter(1/0,-1)
+auto=@attacking(this):phaseaction[combatends] counter(1/1,-1)
+auto=@blocking(this):phaseaction[combatends] 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
@@ -11230,8 +11233,8 @@ name=Clockwork Dragon
 abilities=flying
 auto=counter(1/1,6)
 auto={3}:counter(1/1)
-auto=@attacking(this):phaseaction[combatends] counter(1/0,-1)
-auto=@blocking(this):phaseaction[combatends] counter(1/0,-1)
+auto=@attacking(this):phaseaction[combatends] counter(1/1,-1)
+auto=@blocking(this):phaseaction[combatends] 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
@@ -11270,7 +11273,7 @@ auto=counter(1/0,4)
 auto=cantbeblockedby(creature[artifact])
 auto=@attacking(this):phaseaction[combatends] counter(1/0,-1)
 auto=@blocking(this):phaseaction[combatends] counter(1/0,-1)
-auto={X}{T}:thisforeach(X) all(this) counter(1/0,1) && thisforeach(counter{1/0.1}>4) counter(1/0,-1) myUpkeepOnly
+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}
 type=Artifact Creature
@@ -11284,6 +11287,7 @@ auto=counter(1/0,4)
 auto=cantbeblockedby(wall)
 auto=@attacking(this):phaseaction[combatends] counter(1/0,-1)
 auto=@blocking(this):phaseaction[combatends] 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.
 mana={4}
@@ -11297,8 +11301,8 @@ name=Clockwork Vorrac
 abilities=trample
 auto=counter(1/1,4)
 auto={T}:counter(1/1,1)
-auto=@attacking(this):phaseaction[combatends] counter(1/0,-1)
-auto=@blocking(this):phaseaction[combatends] counter(1/0,-1)
+auto=@attacking(this):phaseaction[combatends] counter(1/1,-1)
+auto=@blocking(this):phaseaction[combatends] 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