diff --git a/src/magic/card/Wall_of_Frost.java b/src/magic/card/Wall_of_Frost.java
index ce5b48a655..cfd9c33296 100644
--- a/src/magic/card/Wall_of_Frost.java
+++ b/src/magic/card/Wall_of_Frost.java
@@ -5,11 +5,10 @@ import magic.model.MagicPermanent;
 import magic.model.MagicPermanentState;
 import magic.model.action.MagicChangeStateAction;
 import magic.model.event.MagicEvent;
-import magic.model.trigger.MagicTrigger;
-import magic.model.trigger.MagicTriggerType;
+import magic.model.trigger.MagicWhenBlocksTrigger;
 
 public class Wall_of_Frost {
-    public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.WhenBlocks) {
+    public static final MagicWhenBlocksTrigger T = new MagicWhenBlocksTrigger() {
 		@Override
 		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent data) {
 			if (permanent==data) {
diff --git a/src/magic/card/Wall_of_Reverence.java b/src/magic/card/Wall_of_Reverence.java
index 4f08060075..17d81a8c12 100644
--- a/src/magic/card/Wall_of_Reverence.java
+++ b/src/magic/card/Wall_of_Reverence.java
@@ -8,11 +8,10 @@ import magic.model.action.MagicPermanentAction;
 import magic.model.choice.MagicTargetChoice;
 import magic.model.event.MagicEvent;
 import magic.model.target.MagicPowerTargetPicker;
-import magic.model.trigger.MagicTrigger;
-import magic.model.trigger.MagicTriggerType;
+import magic.model.trigger.MagicAtEndOfTurnTrigger;
 
 public class Wall_of_Reverence {
-    public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.AtEndOfTurn) {
+    public static final MagicAtEndOfTurnTrigger T = new MagicAtEndOfTurnTrigger() {
 		@Override
 		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer data) {
 			final MagicPlayer player=permanent.getController();
diff --git a/src/magic/card/Warstorm_Surge.java b/src/magic/card/Warstorm_Surge.java
index c211e65a41..0852ed5c9a 100644
--- a/src/magic/card/Warstorm_Surge.java
+++ b/src/magic/card/Warstorm_Surge.java
@@ -10,11 +10,10 @@ import magic.model.choice.MagicTargetChoice;
 import magic.model.event.MagicEvent;
 import magic.model.target.MagicDamageTargetPicker;
 import magic.model.target.MagicTarget;
-import magic.model.trigger.MagicTrigger;
-import magic.model.trigger.MagicTriggerType;
+import magic.model.trigger.MagicWhenOtherComesIntoPlayTrigger;
 
 public class Warstorm_Surge {
-	public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.WhenOtherComesIntoPlay) {
+	public static final MagicWhenOtherComesIntoPlayTrigger T = new MagicWhenOtherComesIntoPlayTrigger() {
 		@Override
 		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent otherPermanent) {
 			final MagicPlayer player = permanent.getController();
diff --git a/src/magic/card/Wort__Boggart_Auntie.java b/src/magic/card/Wort__Boggart_Auntie.java
index 641d9bb01e..dc9e6c302f 100644
--- a/src/magic/card/Wort__Boggart_Auntie.java
+++ b/src/magic/card/Wort__Boggart_Auntie.java
@@ -12,11 +12,11 @@ import magic.model.choice.MagicMayChoice;
 import magic.model.choice.MagicTargetChoice;
 import magic.model.event.MagicEvent;
 import magic.model.target.MagicGraveyardTargetPicker;
-import magic.model.trigger.MagicTrigger;
-import magic.model.trigger.MagicTriggerType;
+import magic.model.trigger.MagicAtUpkeepTrigger;
+
 
 public class Wort__Boggart_Auntie {
-    public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.AtUpkeep) {
+    public static final MagicAtUpkeepTrigger T = new MagicAtUpkeepTrigger() {
 		@Override
 		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer data) {
 			final MagicPlayer player=permanent.getController();
diff --git a/src/magic/card/Wrexial__the_Risen_Deep.java b/src/magic/card/Wrexial__the_Risen_Deep.java
index a22fd14047..4631d7dc88 100644
--- a/src/magic/card/Wrexial__the_Risen_Deep.java
+++ b/src/magic/card/Wrexial__the_Risen_Deep.java
@@ -15,11 +15,11 @@ import magic.model.choice.MagicTargetChoice;
 import magic.model.event.MagicEvent;
 import magic.model.stack.MagicCardOnStack;
 import magic.model.target.MagicGraveyardTargetPicker;
-import magic.model.trigger.MagicTrigger;
-import magic.model.trigger.MagicTriggerType;
+import magic.model.trigger.MagicWhenDamageIsDealtTrigger;
+
 
 public class Wrexial__the_Risen_Deep {
-    public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.WhenDamageIsDealt) {
+    public static final MagicWhenDamageIsDealtTrigger T = new MagicWhenDamageIsDealtTrigger() {
 		@Override
 		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
 			if (damage.getSource()==permanent&&damage.getTarget().isPlayer()&&damage.isCombat()) {
diff --git a/src/magic/card/Wurm_s_Tooth.java b/src/magic/card/Wurm_s_Tooth.java
index 5837a6a08f..b0d8e65779 100644
--- a/src/magic/card/Wurm_s_Tooth.java
+++ b/src/magic/card/Wurm_s_Tooth.java
@@ -9,11 +9,11 @@ import magic.model.action.MagicChangeLifeAction;
 import magic.model.choice.MagicMayChoice;
 import magic.model.event.MagicEvent;
 import magic.model.stack.MagicCardOnStack;
-import magic.model.trigger.MagicTrigger;
-import magic.model.trigger.MagicTriggerType;
+import magic.model.trigger.MagicWhenSpellIsPlayedTrigger;
+
 
 public class Wurm_s_Tooth {
-    public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.WhenSpellIsPlayed) {
+    public static final MagicWhenSpellIsPlayedTrigger T = new MagicWhenSpellIsPlayedTrigger() {
 		@Override
 		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
 			final MagicPlayer player = permanent.getController();
diff --git a/src/magic/card/Wurmcoil_Engine.java b/src/magic/card/Wurmcoil_Engine.java
index d080b191c8..1ed6333c50 100644
--- a/src/magic/card/Wurmcoil_Engine.java
+++ b/src/magic/card/Wurmcoil_Engine.java
@@ -8,11 +8,10 @@ import magic.model.MagicPlayer;
 import magic.model.action.MagicPlayTokenAction;
 import magic.model.event.MagicEvent;
 import magic.model.trigger.MagicGraveyardTriggerData;
-import magic.model.trigger.MagicTrigger;
-import magic.model.trigger.MagicTriggerType;
+import magic.model.trigger.MagicWhenPutIntoGraveyardTrigger;
 
 public class Wurmcoil_Engine {
-    public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.WhenPutIntoGraveyard) {
+    public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
 		@Override
 		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) {
 			final MagicPlayer player = (permanent != null) ? permanent.getController() : null;