diff --git a/html-src/rules/waspii.html b/html-src/rules/waspii.html
new file mode 100644
index 00000000..c33267ab
--- /dev/null
+++ b/html-src/rules/waspii.html
@@ -0,0 +1,13 @@
+<h1>Wasp II</h1>
+<p>
+Spider type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="wasp.html">Wasp</a>,
+but only three of the tableau piles contain
+face-down cards (similar to <a href="scorpionii.html">Scorpion II</a>).
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 414aa232..33d93cf4 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -594,7 +594,7 @@ class GI:
          tuple(range(19000, 19012)) + tuple(range(22303, 22311)) +
          tuple(range(22353, 22361))),
         ('fc-3.1', tuple(range(961, 971))),
-        ('dev', tuple(range(971, 976)) + tuple(range(18005, 18007)) + (526,)),
+        ('dev', tuple(range(971, 977)) + tuple(range(18005, 18007)) + (526,)),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py
index 41238aaa..76e6aa04 100644
--- a/pysollib/games/spider.py
+++ b/pysollib/games/spider.py
@@ -348,15 +348,16 @@ class Scorpion_RowStack(Yukon_SS_RowStack, Spider_RowStack):
 
 
 class Scorpion(RelaxedSpider):
-
     Hint_Class = YukonType_Hint
     RowStack_Class = StackWrapper(Scorpion_RowStack, base_rank=KING)
 
+    FACEDOWNS = (4, 4, 4, 0, 0, 0)
+
     def createGame(self):
         RelaxedSpider.createGame(self, rows=7, playcards=20)
 
     def startGame(self):
-        for i in (4, 4, 4, 0, 0, 0):
+        for i in self.FACEDOWNS:
             self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0)
             self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0)
         self._startAndDealRow()
@@ -379,46 +380,46 @@ class ScorpionTail(Scorpion):
     shallHighlightMatch = Game._shallHighlightMatch_AC
 
 
+# ************************************************************************
+# * Double Scorpion
+# * Triple Scorpion
+# ************************************************************************
+
 class DoubleScorpion(Scorpion):
-    Talon_Class = InitialDealTalonStack
+    FACEDOWNS = (5, 5, 5, 5, 0, 0, 0, 0, 0)
 
     def createGame(self):
         RelaxedSpider.createGame(self, rows=10, playcards=26, texts=0)
 
-    def startGame(self):
-        for i in (5, 5, 5, 5, 0, 0, 0, 0, 0):
-            self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0)
-            self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0)
-        self.startDealSample()
-        self.s.talon.dealRow()
-        self.s.talon.dealRowAvail()
-
 
 class TripleScorpion(Scorpion):
     Talon_Class = InitialDealTalonStack
 
+    FACEDOWNS = (5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0)
+
     def createGame(self):
         RelaxedSpider.createGame(self, rows=13, playcards=30, texts=0)
 
-    def startGame(self):
-        for i in (5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0):
-            self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0)
-            self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0)
-        self._startAndDealRow()
+
+# ************************************************************************
+# * Scorpion II
+# ************************************************************************
+
+class ScorpionII(Scorpion):
+    FACEDOWNS = (3, 3, 3, 0, 0, 0)
 
 
 # ************************************************************************
 # * Wasp
+# * Wasp II
 # ************************************************************************
 
 class Wasp(Scorpion):
     RowStack_Class = Scorpion_RowStack      # anything on an empty space
 
-    def startGame(self):
-        for i in (3, 3, 3, 0, 0, 0):
-            self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0)
-            self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0)
-        self._startAndDealRow()
+
+class WaspII(ScorpionII):
+    RowStack_Class = Scorpion_RowStack
 
 
 # ************************************************************************
@@ -1124,19 +1125,6 @@ class Incompatibility(Spidike):
         self._startDealNumRowsAndDealSingleRow(4)
 
 
-# ************************************************************************
-# * Scorpion II
-# ************************************************************************
-
-class ScorpionII(Scorpion):
-
-    def startGame(self):
-        for i in (3, 3, 3, 0, 0, 0):
-            self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0)
-            self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0)
-        self._startAndDealRow()
-
-
 # ************************************************************************
 # * Tarantula
 # ************************************************************************
@@ -1671,3 +1659,5 @@ registerGame(GameInfo(917, Astrocyte, "Astrocyte",
 registerGame(GameInfo(971, Microbe, "Microbe",
                       GI.GT_SPIDER | GI.GT_SEPARATE_DECKS, 2, 0,
                       GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(976, WaspII, "Wasp II",
+                      GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL))