diff --git a/forge-core/src/main/java/forge/util/ItemPool.java b/forge-core/src/main/java/forge/util/ItemPool.java
index b3ab7cdae17..fded45d31ec 100644
--- a/forge-core/src/main/java/forge/util/ItemPool.java
+++ b/forge-core/src/main/java/forge/util/ItemPool.java
@@ -18,15 +18,11 @@
 package forge.util;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
+import java.util.function.*;
+import java.util.stream.Collector;
 
 import com.google.common.collect.Maps;
 import forge.item.InventoryItem;
@@ -74,6 +70,37 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
         return result;
     }
 
+    public static <T extends InventoryItem> Collector<? extends InventoryItem, ?, ItemPool<T>> collector(Class<T> cls) {
+        return new Collector<InventoryItem, ItemPool<T>, ItemPool<T>>() {
+            @Override
+            public Supplier<ItemPool<T>> supplier() {
+                return () -> new ItemPool<T>(cls);
+            }
+
+            @Override
+            public BiConsumer<ItemPool<T>, InventoryItem> accumulator() {
+                return (pool, item) -> {
+                    if (cls.isInstance(item)) pool.add(cls.cast(item), 1);
+                };
+            }
+
+            @Override
+            public BinaryOperator<ItemPool<T>> combiner() {
+                return (first, second) -> {
+                    first.addAll(second);
+                    return first;
+                };
+            }
+
+            @Override public Function<ItemPool<T>, ItemPool<T>> finisher() {
+                return Function.identity();
+            }
+            @Override public Set<Characteristics> characteristics() {
+                return EnumSet.of(Characteristics.IDENTITY_FINISH);
+            }
+        };
+    }
+
     protected ItemPool(final Map<T, Integer> items0, final Class<T> cls) {
         if (items0 != null) {
             items = items0;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
index 228047427b5..872daa9655c 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
@@ -141,10 +141,10 @@ public final class CEditorVariant extends CDeckEditor<Deck> {
      */
     @Override
     public void resetTables() {
-        Iterable<PaperCard> allNT = FModel.getMagicDb().getVariantCards().getAllCards();
-        allNT = Iterables.filter(allNT, cardPoolCondition);
+        ItemPool<PaperCard> allNT = FModel.getMagicDb().getVariantCards().streamAllCards()
+                .filter(cardPoolCondition).collect(ItemPool.collector(PaperCard.class));
 
-        this.getCatalogManager().setPool(ItemPool.createFrom(allNT, PaperCard.class), true);
+        this.getCatalogManager().setPool(allNT, true);
         this.getDeckManager().setPool(this.controller.getModel().getOrCreate(this.sectionMode));
     }