diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index d02754788..cb9ddfc89 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -600,6 +600,7 @@ mana={3}{U}{U}
 [card]
 text=Whenever Elvish Berserker becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
 id=129533
+auto=rampage(1/1,0)
 name=Elvish Berserker
 rarity=C
 color=Green
diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat
index 244b04c2d..4f900bcb5 100644
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
@@ -623,6 +623,18 @@ subtype=Human Cleric Druid
 toughness=1
 [/card]
 [card]
+text=Whenever Johtull Wurm becomes blocked, it gets -2/-1 until end of turn for each creature blocking it beyond the first.
+id=2574
+name=Johtull Wurm
+auto=rampage(-2/-1,1)
+rarity=U
+type=Creature
+mana={5}{G}
+power=6
+subtype=Wurm
+toughness=6
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {T}: Add {R} or {G} to your mana pool. Karplusan Forest deals 1 damage to you.
 id=2755
 auto={T}:add {1}
diff --git a/projects/mtg/bin/Res/sets/ICE/todo.dat b/projects/mtg/bin/Res/sets/ICE/todo.dat
index 91dc8f06f..ca44a6e18 100644
--- a/projects/mtg/bin/Res/sets/ICE/todo.dat
+++ b/projects/mtg/bin/Res/sets/ICE/todo.dat
@@ -1068,17 +1068,6 @@ type=Artifact
 mana={0}
 [/card]
 [card]
-text=Whenever Johtull Wurm becomes blocked, it gets -2/-1 until end of turn for each creature blocking it beyond the first.
-id=2574
-name=Johtull Wurm
-rarity=U
-type=Creature
-mana={5}{G}
-power=6
-subtype=Wurm
-toughness=6
-[/card]
-[card]
 text=At the beginning of your upkeep, sacrifice Justice unless you pay {W}{W}.       Whenever a red creature or spell deals damage, Justice deals that much damage to that creature's or spell's controller.
 id=2692
 name=Justice
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index cd6cff7c3..5374d5bd0 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -1122,6 +1122,18 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Whenever Sparring Golem becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
+id=23225
+auto=rampage(1/1,0)
+name=Sparring Golem
+rarity=U
+type=Artifact Creature
+mana={3}
+power=2
+subtype=Golem
+toughness=2
+[/card]
+[card]
 text={2}: Target white or black creature gains flying until end of turn. (It can't be blocked except by creatures with flying or reach.)
 id=22996
 name=Sky Weaver
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index 288e71747..702492d85 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -2328,17 +2328,6 @@ type=Sorcery
 mana={X}{2}{B}
 [/card]
 [card]
-text=Whenever Sparring Golem becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
-id=23225
-name=Sparring Golem
-rarity=U
-type=Artifact Creature
-mana={3}
-power=2
-subtype=Golem
-toughness=2
-[/card]
-[card]
 text=Play Spinal Embrace only during combat.       Untap target creature you don't control and gain control of it. It gains haste until end of turn. At end of turn, sacrifice it. If you do, you gain life equal to its toughness.
 id=23189
 name=Spinal Embrace
diff --git a/projects/mtg/bin/Res/sets/MIR/_cards.dat b/projects/mtg/bin/Res/sets/MIR/_cards.dat
index 9b9194d5a..ed01cb8b1 100644
--- a/projects/mtg/bin/Res/sets/MIR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MIR/_cards.dat
@@ -451,6 +451,18 @@ toughness=1
 rarity=U
 [/card]
 [card]
+text=Whenever Jungle Wurm becomes blocked, it gets -1/-1 until end of turn for each creature blocking it beyond the first.
+id=3393
+auto=rampage(-1/-1,1)
+name=Jungle Wurm
+rarity=C
+type=Creature
+mana={3}{G}{G}
+power=5
+subtype=Wurm
+toughness=5
+[/card]
+[card]
 text=Protection from blue
 id=3394 
 name=Karoo Meerkat
@@ -819,6 +831,18 @@ toughness=3
 rarity=C
 [/card]
 [card]
+text=Flying; trample; rampage 4 (Whenever this creature becomes blocked, it gets +4/+4 until end of turn for each creature blocking it beyond the first.)
+id=3268
+auto=rampage(4/4,1)
+name=Teeka's Dragon
+rarity=R
+type=Artifact Creature
+mana={9}
+power=5
+subtype=Dragon
+toughness=5
+[/card]
+[card]
 text={2}{T}: Telim'Tor's Darts deals 1 damage to target player. 
 id=3269 
 name=Telim'Tor's Darts
@@ -1072,7 +1096,7 @@ id=3252
 name=Horrible Hordes
 type=Artifact Creature
 subtype=Spirit
-abilities=rampage
+auto=rampage(1/1,1)
 mana={3}
 power=2
 toughness=2
diff --git a/projects/mtg/bin/Res/sets/MIR/todo.dat b/projects/mtg/bin/Res/sets/MIR/todo.dat
index aaf8136c9..f715644d3 100644
--- a/projects/mtg/bin/Res/sets/MIR/todo.dat
+++ b/projects/mtg/bin/Res/sets/MIR/todo.dat
@@ -1331,17 +1331,6 @@ subtype=Viashino Shaman
 toughness=4
 [/card]
 [card]
-text=Rampage 1 (Whenever this creature becomes blocked, it gets +1/+1 until end of turn for each creature blocking it beyond the first.)
-id=3252
-name=Horrible Hordes
-rarity=U
-type=Artifact Creature
-mana={3}
-power=2
-subtype=Spirit
-toughness=2
-[/card]
-[card]
 text={2}: Igneous Golem gains trample until end of turn.
 id=3253
 name=Igneous Golem
@@ -1485,17 +1474,6 @@ subtype=Troll
 toughness=1
 [/card]
 [card]
-text=Whenever Jungle Wurm becomes blocked, it gets -1/-1 until end of turn for each creature blocking it beyond the first.
-id=3393
-name=Jungle Wurm
-rarity=C
-type=Creature
-mana={3}{G}{G}
-power=5
-subtype=Wurm
-toughness=5
-[/card]
-[card]
 text=Kaervek's Hex deals 1 damage to each nonblack creature and an additional 1 damage to each green creature.
 id=3299
 name=Kaervek's Hex
@@ -2722,17 +2700,6 @@ subtype=Serpent
 toughness=7
 [/card]
 [card]
-text=Flying; trample; rampage 4 (Whenever this creature becomes blocked, it gets +4/+4 until end of turn for each creature blocking it beyond the first.)
-id=3268
-name=Teeka's Dragon
-rarity=R
-type=Artifact Creature
-mana={9}
-power=5
-subtype=Dragon
-toughness=5
-[/card]
-[card]
 text=Enchant artifact or creature     Enchanted permanent has phasing.
 id=3367
 name=Teferi's Curse
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index e0eb851e4..d08cc3aea 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -901,6 +901,18 @@ toughness=2
 rarity=U
 [/card]
 [card]
+text=Whenever Rabid Elephant becomes blocked, it gets +2/+2 until end of turn for each creature blocking it.
+id=29781
+auto=rampage(2/2,0)
+name=Rabid Elephant
+rarity=C
+type=Creature
+mana={4}{G}
+power=3
+subtype=Elephant
+toughness=4
+[/card]
+[card]
 text=Ravaged Highlands comes into play tapped. Tap: Add R to your mana pool. Tap, Sacrifice Ravaged Highlands: Add one mana of any color to your mana pool.
 id=31764
 auto=tap
diff --git a/projects/mtg/bin/Res/sets/ODY/todo.dat b/projects/mtg/bin/Res/sets/ODY/todo.dat
index 0a3637dad..9edd32457 100644
--- a/projects/mtg/bin/Res/sets/ODY/todo.dat
+++ b/projects/mtg/bin/Res/sets/ODY/todo.dat
@@ -1539,17 +1539,6 @@ subtype=Atog
 toughness=2
 [/card]
 [card]
-text=Whenever Rabid Elephant becomes blocked, it gets +2/+2 until end of turn for each creature blocking it.
-id=29781
-name=Rabid Elephant
-rarity=C
-type=Creature
-mana={4}{G}
-power=3
-subtype=Elephant
-toughness=4
-[/card]
-[card]
 text=Destroy target artifact or enchantment.       Flashback {4}{W}{W} (You may play this card from your graveyard for its flashback cost. Then remove it from the game.)
 id=29808
 name=Ray of Distortion
diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h
index 5f0a92ab0..527d3cd8f 100644
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -2917,6 +2917,10 @@ class ARampageAbility:public MTGAbility{
 	    
 		}
 	  }
+	}
+	if( newPhase == Constants::MTG_PHASE_AFTER_EOT ){
+			source->power-= PowerModifier;
+			source->addToToughness(-ToughnessModifier);
 	}
 	  }
 	}
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index c39ea3d71..ad6d98339 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -708,6 +708,37 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card){
         continue;
 	  }
 
+      //rampage
+      found = s.find("rampage(");
+      if (found != string::npos){
+        if (dryMode) {
+          dryModeResult = BAKA_EFFECT_GOOD;
+          dryModeResultSet = 1;
+          break;
+        }
+        int end = s.find(",", found);
+		string spt = s.substr(8,end - 1);
+        int power, toughness;
+		if ( parsePowerToughness(spt,&power, &toughness)){
+			if (dryMode){
+				if (power >=0 && toughness >= 0 ) {
+				dryModeResult =  BAKA_EFFECT_GOOD;
+			}else{
+				dryModeResult =  BAKA_EFFECT_BAD;
+			}
+			break;
+        }
+        int MaxOpponent = atoi(s.substr(found+1).c_str());
+        if(tc){
+			//TODO??
+        }else{
+			game->addObserver(NEW  ARampageAbility(id,card,power,toughness,MaxOpponent));
+
+        }
+        result++;
+        continue;
+		}
+	  }
 
       //Change Power/Toughness
       int power, toughness;
@@ -1766,11 +1797,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
 		  card->target->controller()->life-= 3;
 		  break;
 		}
-	  case 129533: //Elvish Berserker
-		{
-			game->addObserver (NEW ARampageAbility(_id,card,1,1,0));
-		  break;
-		}
 //--- addon shm---
 	case 146013: //Corrupt
 		{