diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java b/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java
index 2705925dd05..96577bcd9d3 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/SoulSeparator.java
@@ -43,7 +43,7 @@ import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreatureCard;
 import mage.game.Game;
-import mage.game.permanent.token.ZombieToken;
+import mage.game.permanent.token.ZombieToken2;
 import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;
 
@@ -105,13 +105,11 @@ class SoulSeparatorEffect extends OneShotEffect {
             boolean result = false;
             if (game.getState().getZone(creatureCard.getId()).equals(Zone.GRAVEYARD)) {
                 result = controller.moveCardToExileWithInfo(creatureCard, null, "", source.getSourceId(), game, Zone.GRAVEYARD, true);
-                ZombieToken token = new ZombieToken();                
-                token.power.setValue(creatureCard.getPower().getValue());
-                token.toughness.setValue(creatureCard.getToughness().getValue());
+                ZombieToken2 token = new ZombieToken2(creatureCard.getPower().getValue(), creatureCard.getToughness().getValue());
                 token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
             }
             return result;
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java
index e5f25bb5525..ebb8fc674f9 100644
--- a/Mage/src/main/java/mage/MageObjectImpl.java
+++ b/Mage/src/main/java/mage/MageObjectImpl.java
@@ -54,8 +54,8 @@ public abstract class MageObjectImpl implements MageObject {
     protected List<String> supertype = new ArrayList<>();
     protected Abilities<Ability> abilities;
     protected String text;
-    public MageInt power;
-    public MageInt toughness;
+    protected MageInt power;
+    protected MageInt toughness;
     protected boolean copy;
 
     public MageObjectImpl() {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java
index 179f22349d2..27150755bd4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PutTokenOntoBattlefieldCopyTargetEffect.java
@@ -179,9 +179,10 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
             return false;
         }
 
-        EmptyToken token = new EmptyToken();
+        EmptyToken token = new EmptyToken();        
         CardUtil.copyTo(token).from(copyFrom); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer)
         applier.apply(game, token);
+        
         if (additionalCardType != null && !token.getCardType().contains(additionalCardType)) {
             token.getCardType().add(additionalCardType);
         }
@@ -192,12 +193,13 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
             token.addAbility(FlyingAbility.getInstance());
         }
         if (tokenPower != 0 || tokenToughness != 0) {
-            token.power.setValue(tokenPower);
-            token.toughness.setValue(tokenToughness);
+            token.setPower(tokenPower);
+            token.setToughness(tokenToughness);
         }
         if (additionalSubType != null && !token.getSubtype().contains(additionalSubType)) {
             token.getSubtype().add(additionalSubType);
         }
+        
         token.putOntoBattlefield(number, game, source.getSourceId(), playerId == null ? source.getControllerId() : playerId, tapped, attacking, attackedPlayer);
         for (UUID tokenId : token.getLastAddedTokenIds()) { // by cards like Doubling Season multiple tokens can be added to the battlefield
             Permanent tokenPermanent = game.getPermanent(tokenId);
diff --git a/Mage/src/main/java/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java
index 172cc354d31..984f9a7e883 100644
--- a/Mage/src/main/java/mage/game/permanent/token/Token.java
+++ b/Mage/src/main/java/mage/game/permanent/token/Token.java
@@ -81,6 +81,12 @@ public class Token extends MageObjectImpl {
         this.name = name;
         this.description = description;
     }
+    
+    public Token(String name, String description, int power, int toughness) {
+        this(name, description);
+        this.power.setValue(power);
+        this.toughness.setValue(toughness);
+    }
 
     public Token(String name, String description, ObjectColor color, List<String> subtype, int power, int toughness, Abilities<Ability> abilities) {
         this(name, description);
@@ -212,6 +218,14 @@ public class Token extends MageObjectImpl {
         }
         return false;
     }
+        
+    public void setPower(int power) {
+        this.power.setValue(power);
+    }
+    
+    public void setToughness(int toughness) {
+        this.toughness.setValue(toughness);
+    }
 
     public int getTokenType() {
         return tokenType;
diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java
new file mode 100644
index 00000000000..0b6967692e8
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java
@@ -0,0 +1,52 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+
+/**
+ *
+ * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
+ */
+public class ZombieToken2 extends Token {
+
+    public ZombieToken2() {
+        super("", "");
+    }
+
+    public ZombieToken2(int zPower, int zToughness) {
+        super("Zombie", String.valueOf(zPower) + "/" + String.valueOf(zToughness) + " black Zombie creature token");
+        cardType.add(CardType.CREATURE);
+        color.setBlack(true);
+        subtype.add("Zombie");
+        power = new MageInt(zPower);
+        toughness = new MageInt(zToughness);
+        setOriginalExpansionSetCode("EMN");
+    }
+}