diff --git a/Mage.Sets/src/mage/cards/s/SunstarLightsmith.java b/Mage.Sets/src/mage/cards/s/SunstarLightsmith.java
new file mode 100644
index 00000000000..7866797ab6c
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/s/SunstarLightsmith.java
@@ -0,0 +1,43 @@
+package mage.cards.s;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.CastSecondSpellTriggeredAbility;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.counters.CounterType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class SunstarLightsmith extends CardImpl {
+
+    public SunstarLightsmith(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
+
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.ARTIFICER);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // Whenever you cast your second spell each turn, put a +1/+1 counter on this creature and draw a card.
+        Ability ability = new CastSecondSpellTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()));
+        ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and"));
+        this.addAbility(ability);
+    }
+
+    private SunstarLightsmith(final SunstarLightsmith card) {
+        super(card);
+    }
+
+    @Override
+    public SunstarLightsmith copy() {
+        return new SunstarLightsmith(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/EdgeOfEternities.java b/Mage.Sets/src/mage/sets/EdgeOfEternities.java
index 8feb82bd270..6afbca68b3b 100644
--- a/Mage.Sets/src/mage/sets/EdgeOfEternities.java
+++ b/Mage.Sets/src/mage/sets/EdgeOfEternities.java
@@ -310,6 +310,7 @@ public final class EdgeOfEternities extends ExpansionSet {
         cards.add(new SetCardInfo("Sunstar Chaplain", 324, Rarity.RARE, mage.cards.s.SunstarChaplain.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Sunstar Chaplain", 40, Rarity.RARE, mage.cards.s.SunstarChaplain.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Sunstar Expansionist", 41, Rarity.UNCOMMON, mage.cards.s.SunstarExpansionist.class));
+        cards.add(new SetCardInfo("Sunstar Lightsmith", 42, Rarity.UNCOMMON, mage.cards.s.SunstarLightsmith.class));
         cards.add(new SetCardInfo("Survey Mechan", 245, Rarity.UNCOMMON, mage.cards.s.SurveyMechan.class));
         cards.add(new SetCardInfo("Susur Secundi, Void Altar", 259, Rarity.MYTHIC, mage.cards.s.SusurSecundiVoidAltar.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Susur Secundi, Void Altar", 284, Rarity.MYTHIC, mage.cards.s.SusurSecundiVoidAltar.class, NON_FULL_USE_VARIOUS));