diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeoftheTangle.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeoftheTangle.java
index faeb8c81ca..7523b62acb 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeoftheTangle.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeoftheTangle.java
@@ -32,7 +32,11 @@ import java.util.UUID;
 
 import mage.Constants;
 import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Layer;
+import mage.Constants.Outcome;
 import mage.Constants.Rarity;
+import mage.Constants.SubLayer;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
@@ -42,6 +46,7 @@ import mage.abilities.condition.common.Metalcraft;
 import mage.abilities.condition.common.MyTurn;
 import mage.abilities.decorator.ConditionalContinousEffect;
 import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.continious.BecomesCreatureSourceEOTEffect;
 import mage.abilities.effects.common.continious.BoostSourceEffect;
@@ -89,12 +94,13 @@ public class LiegeoftheTangle extends CardImpl<LiegeoftheTangle> {
 class LiegeoftheTangleTriggeredAbility extends TriggeredAbilityImpl<LiegeoftheTangleTriggeredAbility> {
 	LiegeoftheTangleTriggeredAbility() {
 		super(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.AWAKENING.createInstance()));
-		Ability ability  = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD,
-                        	new ConditionalContinousEffect(
-                                new BecomesCreatureSourceEOTEffect(new AwakeningLandToken(), "land"),
-                                new HaveCounter(CounterType.AWAKENING),
-                                "This land is an 8/8 green Elemental creature for as long as it has an awakening counter on it. It's still a land"));
-        this.addEffect(new GainAbilityTargetEffect(ability, Constants.Duration.EndOfGame));
+		this.addEffect(new LiegeoftheTangleEffect());
+//		Ability ability  = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD,
+//                        	new ConditionalContinousEffect(
+//                                new BecomesCreatureSourceEOTEffect(new AwakeningLandToken(), "land"),
+//                                new HaveCounter(CounterType.AWAKENING),
+//                                "This land is an 8/8 green Elemental creature for as long as it has an awakening counter on it. It's still a land"));
+//        this.addEffect(new GainAbilityTargetEffect(ability, Constants.Duration.EndOfGame));
 		Target target = new TargetLandPermanent(0, Integer.MAX_VALUE, new FilterLandPermanent(), true);
 		this.addTarget(target);
 	}
@@ -126,6 +132,76 @@ class LiegeoftheTangleTriggeredAbility extends TriggeredAbilityImpl<LiegeoftheTa
 	}
 }
 
+class LiegeoftheTangleEffect extends ContinuousEffectImpl<LiegeoftheTangleEffect> {
+
+	private static AwakeningLandToken token = new AwakeningLandToken();
+
+	public LiegeoftheTangleEffect() {
+		super(Duration.EndOfGame, Outcome.BecomeCreature);
+	}
+
+	public LiegeoftheTangleEffect(final LiegeoftheTangleEffect effect) {
+		super(effect);
+	}
+
+	@Override
+	public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
+		for (UUID permId: objects) {
+			Permanent perm = game.getPermanent(permId);
+			if (perm != null) {
+				if (perm.getCounters().getCount(CounterType.AWAKENING) > 0) {
+					switch (layer) {
+						case TypeChangingEffects_4:
+							if (sublayer == SubLayer.NA) {
+								perm.getCardType().addAll(token.getCardType());
+								perm.getSubtype().addAll(token.getSubtype());
+							}
+							break;
+						case ColorChangingEffects_5:
+							if (sublayer == SubLayer.NA) {
+								perm.getColor().setColor(token.getColor());
+							}
+							break;
+						case PTChangingEffects_7:
+							if (sublayer == SubLayer.SetPT_7b) {
+								perm.getPower().setValue(token.getPower().getValue());
+								perm.getToughness().setValue(token.getToughness().getValue());
+							}
+							break;
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean apply(Game game, Ability source) {
+		return false;
+	}
+
+	@Override
+	public void init(Ability source, Game game) {
+		super.init(source, game);
+		if (this.affectedObjectsSet) {
+			for (UUID permId: source.getTargets().get(0).getTargets()) {
+				objects.add(permId);
+			}
+		}
+	}
+
+	@Override
+	public LiegeoftheTangleEffect copy() {
+		return new LiegeoftheTangleEffect(this);
+	}
+
+	@Override
+	public boolean hasLayer(Layer layer) {
+		return layer == Layer.PTChangingEffects_7 || layer == Layer.ColorChangingEffects_5 || layer == layer.TypeChangingEffects_4;
+	}
+
+}
+
 class AwakeningLandToken extends Token {
 
     public AwakeningLandToken() {
diff --git a/Mage/src/mage/abilities/effects/ContinuousEffectImpl.java b/Mage/src/mage/abilities/effects/ContinuousEffectImpl.java
index c6b563c4d6..b97817515c 100644
--- a/Mage/src/mage/abilities/effects/ContinuousEffectImpl.java
+++ b/Mage/src/mage/abilities/effects/ContinuousEffectImpl.java
@@ -39,6 +39,7 @@ import mage.Constants.Outcome;
 import mage.Constants.SubLayer;
 import mage.abilities.Ability;
 import mage.abilities.ActivatedAbility;
+import mage.abilities.TriggeredAbility;
 import mage.game.Game;
 
 /**
@@ -122,7 +123,7 @@ public abstract class ContinuousEffectImpl<T extends ContinuousEffectImpl<T>> ex
 	@Override
 	public void init(Ability source, Game game) {
 		//20100716 - 611.2c
-		if (source instanceof ActivatedAbility) {
+		if (source instanceof ActivatedAbility || source instanceof TriggeredAbility) {
 			if (layer != null) {
 				switch (layer) {
 					case CopyEffects_1: