diff --git a/app/lib/icemake.ts b/app/lib/icemake.ts
index 5c439bd..827d7dc 100644
--- a/app/lib/icemake.ts
+++ b/app/lib/icemake.ts
@@ -8,7 +8,7 @@ export type ComponentGraphNode = {
 
 export type ExecutionStep = {
   componentIndex: number;
-  stack: Flavor[];
+  stack: Flavor[] | null; // コーンが食べられたらnull
   branchTaken?: boolean;
 };
 
@@ -17,6 +17,7 @@ export type IcemakeResult = {
   traces: { color: ConeColor; steps: ExecutionStep[] }[];
 };
 
+// 1つのコーンに積めるアイスの最大数（UI上の想定に合わせた安全上限）
 const MAX_ICE_STACK_SIZE = 10;
 
 export function icemake(
@@ -28,6 +29,7 @@ export function icemake(
   const stageData = STAGES[stage];
   if (!stageData) return { result: {}, traces: [] };
 
+  // グラフが渡されたときは、各色ごとに実行トレースを取りながら結果を計算する
   if (graph && firstComponentId !== undefined) {
     const traces = colors.map((color) => {
       const steps = runGraphExecution(
@@ -38,16 +40,18 @@ export function icemake(
       );
       return { color, steps };
     });
+    // 最終ステップのstackをその色の完成結果として採用する
     const result = Object.fromEntries(
       traces.map(({ color, steps }) => [
         color,
-        steps.length > 0 ? steps[steps.length - 1].stack : [],
+        steps.length > 0 ? (steps[steps.length - 1].stack ?? []) : [],
       ]),
     );
     return { result, traces };
   }
 
   return {
+    // グラフ未実行時はステージ定義のミッションを既定値として返す
     result: Object.fromEntries(
       colors.map((color) => [color, stageData.mission[color] ?? []]),
     ),
@@ -61,8 +65,10 @@ function runGraphExecution(
   graph: Record<number, ComponentGraphNode>,
   firstComponentId: number,
 ): ExecutionStep[] {
-  const stack: Flavor[] = [];
+  // コーンが食べられたらnull
+  let stack: Flavor[] | null = [];
   const steps: ExecutionStep[] = [];
+  // 同じノード + 同じstack状態に再訪したら無限ループとみなして停止する
   const visited: Map<number, Set<string>> = new Map();
   let currentId: number | null = firstComponentId;
 
@@ -80,14 +86,17 @@ function runGraphExecution(
     if (!componentVisited || componentVisited.has(stackKey)) break;
     componentVisited.add(stackKey);
 
+    if (!stack) break;
+
     switch (component.type) {
       case "push":
         if (stack.length < MAX_ICE_STACK_SIZE) stack.push(component.flavor);
         break;
       case "pop":
-        if (
-          stack.length > 0 &&
-          (!component.flavor || stack[stack.length - 1] === component.flavor)
+        if (stack.length === 0) stack = null;
+        else if (
+          !component.flavor ||
+          stack[stack.length - 1] === component.flavor
         )
           stack.pop();
         break;
@@ -95,43 +104,58 @@ function runGraphExecution(
         break;
     }
 
-    const children: ComponentGraphNode["childrenIds"] = node.childrenIds;
-
-    let branchTaken: boolean | undefined;
-    if (children != null && typeof children !== "number") {
-      let condition = false;
-      if (component.type === "if") {
-        const cond: ConeColor | Flavor | Flavor[] | number =
-          component.condition;
-        if (typeof cond === "string") {
-          if (coneColors.includes(cond as ConeColor))
-            condition = color === cond;
-          else if (flavors.includes(cond as Flavor))
-            condition = stack.length > 0 && stack[stack.length - 1] === cond;
-        } else if (Array.isArray(cond)) {
-          for (let i = 0; i <= stack.length - cond.length; i++) {
-            if (
-              stack.slice(i, i + cond.length).every((f, j) => f === cond[j])
-            ) {
-              condition = true;
-              break;
+    if (!stack) {
+      steps.push({
+        componentIndex: currentId,
+        stack: null,
+        branchTaken: undefined,
+      });
+    } else {
+      const children: ComponentGraphNode["childrenIds"] = node.childrenIds;
+
+      let branchTaken: boolean | undefined;
+      if (children != null && typeof children !== "number") {
+        let condition = false;
+        // ifノードの条件を、色 / 先頭フレーバー / 部分配列一致 / 個数で評価する
+        if (component.type === "if") {
+          const cond: ConeColor | Flavor | Flavor[] | number =
+            component.condition;
+          if (typeof cond === "string") {
+            if (coneColors.includes(cond as ConeColor))
+              condition = color === cond;
+            else if (flavors.includes(cond as Flavor))
+              condition = stack.length > 0 && stack[stack.length - 1] === cond;
+          } else if (Array.isArray(cond)) {
+            for (let i = 0; i <= stack.length - cond.length; i++) {
+              if (
+                stack.slice(i, i + cond.length).every((f, j) => f === cond[j])
+              ) {
+                condition = true;
+                break;
+              }
             }
+          } else if (typeof cond === "number") {
+            condition = stack.length >= cond;
           }
-        } else if (typeof cond === "number") {
-          condition = stack.length >= cond;
         }
+        branchTaken = condition;
       }
-      branchTaken = condition;
-    }
 
-    steps.push({ componentIndex: currentId, stack: [...stack], branchTaken });
+      steps.push({
+        componentIndex: currentId,
+        stack: stack === null ? null : [...stack],
+        branchTaken,
+      });
 
-    if (children == null) break;
+      if (children == null) break;
 
-    if (typeof children === "number") {
-      currentId = children;
-    } else {
-      currentId = branchTaken ? children.true : children.false;
+      if (typeof children === "number") {
+        // 直線接続
+        currentId = children;
+      } else {
+        // 分岐接続（true/false）
+        currentId = branchTaken ? children.true : children.false;
+      }
     }
   }
 
diff --git a/app/routes/stage.$id.tsx b/app/routes/stage.$id.tsx
index 7cc6886..306685c 100644
--- a/app/routes/stage.$id.tsx
+++ b/app/routes/stage.$id.tsx
@@ -113,7 +113,15 @@ function getComponentSrc(
   return { src: "" };
 }
 
-function ConeStack({ color, stack }: { color: ConeColor; stack: Flavor[] }) {
+function ConeStack({
+  color,
+  stack,
+}: {
+  color: ConeColor;
+  stack: Flavor[] | null;
+}) {
+  if (stack === null) return null;
+
   return (
     <div className="flex flex-col-reverse items-center">
       <img src={`/cone_${color}.png`} alt="" className="h-10" />
@@ -154,11 +162,16 @@ function StraightNode({ data }: NodeProps<AppNode>) {
     <div className="group flex flex-col items-center relative">
       <button
         type="button"
-        className={`pixel-btn pixel-btn-small absolute -top-0 -right-10 z-10 ${data.onDelete
+        className={`pixel-btn pixel-btn-small absolute -top-0 -right-10 z-10 ${
+          data.onDelete
             ? "opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto"
             : "opacity-0 pointer-events-none"
-          }`}
-        style={{ fontSize: "0.75rem", padding: "0.25rem 0.5rem", lineHeight: 1 }}
+        }`}
+        style={{
+          fontSize: "0.75rem",
+          padding: "0.25rem 0.5rem",
+          lineHeight: 1,
+        }}
         onClick={() => data.onDelete?.()}
         aria-label="ノードを削除"
       >
@@ -208,11 +221,16 @@ function SplitNode({ data }: NodeProps<AppNode>) {
     <div className="group flex flex-col items-center relative">
       <button
         type="button"
-        className={`pixel-btn pixel-btn-small absolute -top-0 -right-15 z-10 ${data.onDelete
+        className={`pixel-btn pixel-btn-small absolute -top-0 -right-15 z-10 ${
+          data.onDelete
             ? "opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto"
             : "opacity-0 pointer-events-none"
-          }`}
-        style={{ fontSize: "0.75rem", padding: "0.25rem 0.5rem", lineHeight: 1 }}
+        }`}
+        style={{
+          fontSize: "0.75rem",
+          padding: "0.25rem 0.5rem",
+          lineHeight: 1,
+        }}
         onClick={() => data.onDelete?.()}
         aria-label="ノードを削除"
       >
@@ -347,7 +365,7 @@ function checkClear(
 }
 
 type AnimSegment = {
-  stackAfter: Flavor[];
+  stackAfter: Flavor[] | null;
   durationMs: number;
   componentIndex?: number;
   branchTaken?: boolean;
@@ -371,7 +389,7 @@ type FlyingConeRender = {
   color: ConeColor;
   x: number;
   y: number;
-  stack: Flavor[];
+  stack: Flavor[] | null;
 };
 
 type TransitCone = {
@@ -638,12 +656,12 @@ function StageInner({
   const [remainedComponentIdxs, setRemainedComponentIdxs] = useState<number[]>([
     ...Array(stageData.components.length).keys(),
   ]);
-  const [nodes, setNodes, onNodesChange] = useNodesState<AppNode>(
-    createInitialNodes(),
-  );
+  const [nodes, setNodes, onNodesChange] =
+    useNodesState<AppNode>(createInitialNodes());
   const [edges, setEdges, onEdgesChange] = useEdgesState<Edge>([]);
   const { screenToFlowPosition, getViewport, setViewport } = useReactFlow();
   const [isClear, setIsClear] = useState(false);
+  const [showClear, setShowClear] = useState(false);
   const [failMessage, setFailMessage] = useState<React.ReactNode>("");
   const [isAnimating, setIsAnimating] = useState(false);
   const [flyingCones, setFlyingCones] = useState<FlyingConeRender[]>([]);
@@ -662,19 +680,27 @@ function StageInner({
   >([]);
   const [paletteEntries, setPaletteEntries] = useState<PaletteEntry[]>([]);
   const [hoveredEdgeId, setHoveredEdgeId] = useState<string | null>(null);
-  const [dragOverlayNode, setDragOverlayNode] = useState<DragOverlayNode | null>(null);
+  const [dragOverlayNode, setDragOverlayNode] =
+    useState<DragOverlayNode | null>(null);
   const nodeTypes = useMemo(
     () => ({ start: StartNode, straight: StraightNode, split: SplitNode }),
     [],
   );
 
-  function CustomEdge({ id, sourceX, sourceY, targetX, targetY, style }: EdgeProps) {
+  function CustomEdge({
+    id,
+    sourceX,
+    sourceY,
+    targetX,
+    targetY,
+    style,
+  }: EdgeProps) {
     const [edgePath] = getStraightPath({ sourceX, sourceY, targetX, targetY });
     const midX = (sourceX + targetX) / 2;
     const midY = (sourceY + targetY) / 2;
     const buttonWidth = 60;
     const buttonHeight = 24;
-    const isDeleteVisible = !isAnimating && hoveredEdgeId === id;
+    const isDeleteVisible = !isAnimating && !isClear && hoveredEdgeId === id;
 
     return (
       <>
@@ -718,9 +744,13 @@ function StageInner({
             <button
               type="button"
               className="pixel-btn pixel-btn-small"
-              style={{ fontSize: "0.75rem", padding: "0.25rem 0.5rem", lineHeight: 1 }}
+              style={{
+                fontSize: "0.75rem",
+                padding: "0.25rem 0.5rem",
+                lineHeight: 1,
+              }}
               onClick={() => {
-                if (isAnimating) return;
+                if (isAnimating || isClear) return;
                 setEdges((edges) => edges.filter((e) => e.id !== id));
               }}
               aria-label="エッジを削除"
@@ -733,10 +763,7 @@ function StageInner({
     );
   }
 
-  const edgeTypes = useMemo(
-    () => ({ custom: CustomEdge }),
-    [hoveredEdgeId],
-  );
+  const edgeTypes = useMemo(() => ({ custom: CustomEdge }), [hoveredEdgeId]);
 
   const renderedNodes = useMemo(
     () =>
@@ -755,7 +782,11 @@ function StageInner({
 
   const onConnect: OnConnect = useCallback(
     (params) => {
-      const style = { stroke: "#6b7280", strokeWidth: 10, strokeLinecap: "round" as const };
+      const style = {
+        stroke: "#6b7280",
+        strokeWidth: 10,
+        strokeLinecap: "round" as const,
+      };
 
       setEdges((eds) => {
         const sourceNode = nodes.find((n) => n.id === params.source);
@@ -1024,6 +1055,7 @@ function StageInner({
     setNodes(createInitialNodes());
     setEdges([]);
     setIsClear(false);
+    setShowClear(false);
     setFailMessage("");
     setIsAnimating(false);
     setFlyingCones([]);
@@ -1083,7 +1115,7 @@ function StageInner({
   };
 
   const handleExecute = () => {
-    if (isAnimating) return;
+    if (isAnimating || isClear) return;
 
     // Require all components to be placed before execution
     if (remainedComponentIdxs.length > 0) {
@@ -1095,9 +1127,8 @@ function StageInner({
           </ruby>
           を
           <ruby>
-            使
-            <rt>つか</rt>
-          </ruby> 
+            使<rt>つか</rt>
+          </ruby>
           わないと
           <ruby>
             実行
@@ -1191,8 +1222,7 @@ function StageInner({
           </ruby>
           を
           <ruby>
-            使
-            <rt>つか</rt>
+            使<rt>つか</rt>
           </ruby>
           わないと
           <ruby>
@@ -1219,6 +1249,7 @@ function StageInner({
 
     setFailMessage("");
     setIsClear(false);
+    setShowClear(false);
     setIsAnimating(true);
     setPaletteEntries([]);
     setTransitConeRenders([]);
@@ -1293,19 +1324,23 @@ function StageInner({
         const py = seg.y1 + (seg.y2 - seg.y1) * progress;
 
         const stack =
-          progress >= 1
+          seg.isNodePause && seg.stackAfter === null
+            ? null
+            : progress >= 1
             ? seg.stackAfter
             : cone.currentSegment > 0
               ? cone.segments[cone.currentSegment - 1].stackAfter
               : [];
 
-        rendered.push({
-          id: cone.id,
-          color: cone.color,
-          x: px * viewport.zoom + viewport.x,
-          y: py * viewport.zoom + viewport.y,
-          stack,
-        });
+        if (stack !== null) {
+          rendered.push({
+            id: cone.id,
+            color: cone.color,
+            x: px * viewport.zoom + viewport.x,
+            y: py * viewport.zoom + viewport.y,
+            stack,
+          });
+        }
 
         if (progress >= 1) {
           cone.currentSegment++;
@@ -1337,6 +1372,7 @@ function StageInner({
           const targetX = slotRect.left - outerRect.left + slotRect.width / 2;
           const targetY = slotRect.top - outerRect.top + slotRect.height / 2;
           const lastSeg = cone.segments[cone.segments.length - 1];
+          if (lastSeg.stackAfter === null) continue;
           anim.transitCones.push({
             id: cone.id,
             color: cone.color,
@@ -1406,6 +1442,7 @@ function StageInner({
         resetAnimation();
         if (checkClear(stageData.mission, anim.result)) {
           setIsClear(true);
+          setShowClear(true);
         } else {
           setFailMessage(
             <>
@@ -1438,6 +1475,7 @@ function StageInner({
 
   const handleNavigate = (path: string) => {
     setIsClear(false);
+    setShowClear(false);
     setFailMessage("");
     navigate(path);
   };
@@ -1509,22 +1547,22 @@ function StageInner({
           edges={edges}
           nodeTypes={nodeTypes}
           edgeTypes={edgeTypes}
-          onNodesChange={isAnimating ? undefined : onNodesChange}
-          onEdgesChange={isAnimating ? undefined : onEdgesChange}
+          onNodesChange={isAnimating || isClear ? undefined : onNodesChange}
+          onEdgesChange={isAnimating || isClear ? undefined : onEdgesChange}
           onEdgeMouseEnter={(_event, edge) => setHoveredEdgeId(edge.id)}
           onEdgeMouseLeave={(_event, edge) =>
             setHoveredEdgeId((prev) => (prev === edge.id ? null : prev))
           }
-          onConnect={isAnimating ? undefined : onConnect}
-          onDrop={isAnimating ? undefined : onDrop}
-          onDragOver={isAnimating ? undefined : onDragOver}
-          nodesDraggable={!isAnimating}
-          nodesConnectable={!isAnimating}
-          elementsSelectable={!isAnimating}
-          panOnDrag={!isAnimating}
-          zoomOnScroll={!isAnimating}
-          zoomOnPinch={!isAnimating}
-          zoomOnDoubleClick={!isAnimating}
+          onConnect={isAnimating || isClear ? undefined : onConnect}
+          onDrop={isAnimating || isClear ? undefined : onDrop}
+          onDragOver={isAnimating || isClear ? undefined : onDragOver}
+          nodesDraggable={!isAnimating && !isClear}
+          nodesConnectable={!isAnimating && !isClear}
+          elementsSelectable={!isAnimating && !isClear}
+          panOnDrag={!isAnimating && !isClear}
+          zoomOnScroll={!isAnimating && !isClear}
+          zoomOnPinch={!isAnimating && !isClear}
+          zoomOnDoubleClick={!isAnimating && !isClear}
           onNodeDrag={onNodeDrag}
           onNodeDragStart={onNodeDragStart}
           onNodeDragStop={onNodeDragStop}
@@ -1541,8 +1579,7 @@ function StageInner({
           }}
           connectionLineType={ConnectionLineType.Straight}
           defaultViewport={DEFAULT_VIEWPORT}
-        >
-        </ReactFlow>
+        ></ReactFlow>
 
         {flyingCones.map((cone) => (
           <div
@@ -1573,14 +1610,15 @@ function StageInner({
                 ref={(el) => {
                   if (el) paletteSlotRefs.current.set(color, el);
                 }}
-                className={`border-2 rounded-lg p-2 flex flex-col items-center min-h-32 justify-center ${allArrivedToPalette
+                className={`border-2 rounded-lg p-2 flex flex-col items-center min-h-32 justify-center ${
+                  allArrivedToPalette
                     ? isMatch
                       ? "border-green-500 bg-green-50"
                       : "border-red-500 bg-red-50"
                     : entry
                       ? "border-gray-300"
                       : "border-dashed border-gray-300"
-                  }`}
+                }`}
               >
                 {entry ? (
                   <ConeStack color={entry.color} stack={entry.stack} />
@@ -1716,39 +1754,59 @@ function StageInner({
             ■
           </button>
         )}
-        <button
-          type="button"
-          className="pixel-btn pixel-btn-small pixel-btn-secondary"
-          onClick={() => {
-            const idx = SPEED_OPTIONS.findIndex((o) => o.multiplier === speedMultiplier);
-            const next = SPEED_OPTIONS[(idx + 1) % SPEED_OPTIONS.length];
-            setSpeedMultiplier(next.multiplier);
-            speedRef.current = next.multiplier;
-          }}
-        >
-          {SPEED_OPTIONS.find((o) => o.multiplier === speedMultiplier)?.label ?? SPEED_OPTIONS[0].label}
-        </button>
-        <button
-          type="button"
-          className="pixel-btn"
-          onClick={handleExecute}
-          disabled={isAnimating}
-        >
-          {isAnimating ? (
-            <span>
+        {!isClear && (
+          <button
+            type="button"
+            className="pixel-btn pixel-btn-small pixel-btn-secondary"
+            onClick={() => {
+              const idx = SPEED_OPTIONS.findIndex(
+                (o) => o.multiplier === speedMultiplier,
+              );
+              const next = SPEED_OPTIONS[(idx + 1) % SPEED_OPTIONS.length];
+              setSpeedMultiplier(next.multiplier);
+              speedRef.current = next.multiplier;
+            }}
+          >
+            {SPEED_OPTIONS.find((o) => o.multiplier === speedMultiplier)
+              ?.label ?? SPEED_OPTIONS[0].label}
+          </button>
+        )}
+        {isClear ? (
+          nextStageExists && (
+            <button
+              type="button"
+              className="pixel-btn"
+              onClick={() => handleNavigate(`/stage/${stageId + 1}`)}
+            >
               <ruby>
-                実行中
-                <rt>じっこうちゅう</rt>
+                次<rt>つぎ</rt>
               </ruby>
-              ...
-            </span>
-          ) : (
-            <ruby>
-              実行
-              <rt>じっこう</rt>
-            </ruby>
-          )}
-        </button>
+              のステージへ →
+            </button>
+          )
+        ) : (
+          <button
+            type="button"
+            className="pixel-btn"
+            onClick={handleExecute}
+            disabled={isAnimating}
+          >
+            {isAnimating ? (
+              <span>
+                <ruby>
+                  実行中
+                  <rt>じっこうちゅう</rt>
+                </ruby>
+                ...
+              </span>
+            ) : (
+              <ruby>
+                実行
+                <rt>じっこう</rt>
+              </ruby>
+            )}
+          </button>
+        )}
       </div>
 
       {/* Fail message */}
@@ -1759,9 +1817,24 @@ function StageInner({
       )}
 
       {/* Clear overlay */}
-      {isClear && (
+      {showClear && (
         <div className="clear-overlay">
-          <div className="clear-modal">
+          <div className="clear-modal relative">
+            <button
+              type="button"
+              className="z-10 pixel-btn pixel-btn-small"
+              style={{
+                position: "absolute",
+                right: "-1rem",
+                top: "-1rem",
+                fontSize: "2rem",
+                padding: "0.5rem 1rem",
+                lineHeight: "2rem",
+              }}
+              onClick={() => setShowClear(false)}
+            >
+              ×
+            </button>
             <div className="font-[DotGothic16] text-4xl mb-6 text-gray-800">
               クリア！
             </div>
diff --git a/app/stages.ts b/app/stages.ts
index 8813df6..21a3e30 100644
--- a/app/stages.ts
+++ b/app/stages.ts
@@ -12,6 +12,60 @@ export type StageData = {
 
 export const STAGES: Record<number, StageData> = {
   1: {
+    mission: {
+      red: ["vanilla"],
+    },
+    components: [{ type: "push", flavor: "vanilla" }],
+  },
+  2: {
+    mission: {
+      red: ["chocolate", "vanilla", "strawberry"],
+    },
+    components: [
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+    ],
+  },
+  3: {
+    mission: {
+      red: ["strawberry", "vanilla"],
+      yellow: ["strawberry", "chocolate"],
+    },
+    components: [
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+      { type: "if", condition: "red" },
+    ],
+  },
+  4: {
+    mission: {
+      red: ["vanilla"],
+      yellow: ["chocolate"],
+      brown: ["strawberry"],
+    },
+    components: [
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+      { type: "if", condition: "red" },
+      { type: "if", condition: "brown" },
+    ],
+  },
+  5: {
+    mission: {
+      red: ["vanilla", "chocolate", "strawberry"],
+      yellow: ["chocolate", "strawberry"],
+    },
+    components: [
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+      { type: "if", condition: "red" },
+    ],
+  },
+  6: {
     mission: {
       red: ["vanilla", "chocolate"],
       yellow: ["strawberry", "vanilla"],
@@ -25,49 +79,49 @@ export const STAGES: Record<number, StageData> = {
       { type: "pop", flavor: undefined },
     ],
   },
-    2: {
+  7: {
     mission: {
       red: ["chocolate"],
       yellow: ["vanilla", "strawberry"],
-      brown: ["vanilla", "chocolate"]
+      brown: ["vanilla", "chocolate"],
     },
     components: [
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "chocolate"},
-      {type: "push", flavor: "strawberry"},
-      {type: "if", condition: "red"},
-      {type: "if", condition: "yellow"},
-      {type: "pop", flavor: undefined},
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+      { type: "if", condition: "red" },
+      { type: "if", condition: "yellow" },
+      { type: "pop", flavor: undefined },
     ],
   },
-      3: {
+  8: {
     mission: {
-      red: ["chocolate", "vanilla", "chocolate"],
-      yellow: ["vanilla", "vanilla", "vanilla"],
+      red: ["vanilla", "vanilla", "vanilla"],
+      yellow: ["chocolate", "chocolate", "chocolate"],
+      brown: ["strawberry", "strawberry", "strawberry"],
     },
     components: [
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "chocolate"},
-      {type: "if", condition: "yellow"},
-      {type: "if", condition: 3},
-
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+      { type: "if", condition: "red" },
+      { type: "if", condition: "brown" },
+      { type: "if", condition: 3 },
     ],
   },
-        4: {
+  9: {
     mission: {
-      red: ["vanilla", "chocolate", "vanilla", "chocolate"],
-      yellow: ["chocolate", "vanilla", "chocolate", "chocolate"],
+      red: ["chocolate", "vanilla", "chocolate"],
+      yellow: ["vanilla", "vanilla", "vanilla"],
     },
     components: [
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "chocolate"},
-      {type: "push", flavor: "chocolate"},
-      {type: "if", condition: "yellow"},
-      {type: "if", condition: 4},
-
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "if", condition: "yellow" },
+      { type: "if", condition: 3 },
     ],
   },
-  11: {
+  10: {
     mission: {
       red: ["strawberry", "vanilla", "strawberry", "vanilla", "vanilla"],
       yellow: ["strawberry", "vanilla", "strawberry", "vanilla", "chocolate"],
@@ -81,102 +135,68 @@ export const STAGES: Record<number, StageData> = {
       { type: "if", condition: "red" },
     ],
   },
-  12: {
+  11: {
     mission: {
-      red: ["vanilla", "chocolate", "vanilla"],
-      yellow: ["vanilla", "vanilla", "chocolate"]
+      red: ["vanilla", "chocolate", "vanilla", "chocolate"],
+      yellow: ["chocolate", "vanilla", "chocolate", "chocolate"],
     },
     components: [
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "chocolate"},
-      {type: "push", flavor: "chocolate"},
-      {type: "if", condition: "red"},
-      {type: "if", condition: ["vanilla", "vanilla"]},
-      {type: "pop", flavor: "chocolate"}
-    ]
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "chocolate" },
+      { type: "if", condition: "yellow" },
+      { type: "if", condition: 4 },
+    ],
   },
-  13: {
+  12: {
     mission: {
       red: ["chocolate", "strawberry", "vanilla"],
-      yellow: [ "strawberry", "vanilla","chocolate"],
-      brown: [ "vanilla","chocolate", "strawberry"],
+      yellow: ["strawberry", "vanilla", "chocolate"],
+      brown: ["vanilla", "chocolate", "strawberry"],
     },
     components: [
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "chocolate"},
-      {type: "push", flavor: "strawberry"},
-      {type: "if", condition: "red"},
-      {type: "if", condition: "yellow"},
-      {type: "if", condition: 3},
-      {type: "if", condition: 3},
-      {type: "if", condition: 3},
-    ]
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+      { type: "if", condition: "red" },
+      { type: "if", condition: "yellow" },
+      { type: "if", condition: 3 },
+      { type: "if", condition: 3 },
+      { type: "if", condition: 3 },
+    ],
   },
   14: {
     mission: {
-      red: ["vanilla", "vanilla", "vanilla"],
-     yellow: ["chocolate", "chocolate", "chocolate"],
-      brown: ["strawberry", "strawberry", "strawberry"]
-    },
-    components: [
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "chocolate"},
-      {type: "push", flavor: "strawberry"},
-      {type: "if", condition: "red"},
-      {type: "if", condition: "brown"},
-      {type: "if", condition: 3}
-    ]
-},  15: {
-    mission: {
-      red: ["chocolate", "strawberry", "chocolate", "vanilla"],
-      yellow: ["chocolate", "strawberry", "chocolate", "strawberry", "chocolate", "strawberry", "vanilla"]
-    },
-    components: [
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "chocolate"},
-      {type: "push", flavor: "strawberry"},
-      {type: "if", condition: 6},
-      {type: "if", condition: "red"},
-      {type: "if", condition: ["strawberry", "chocolate", "strawberry"]},
-      {type: "pop", flavor: undefined}
-    ]
-},
-  16: {
-    mission: {
-      red: ["chocolate", "strawberry" ,"chocolate", "strawberry", "chocolate", "strawberry"],
-      yellow: ["strawberry", "chocolate", "vanilla", "strawberry"],
-      brown: ["chocolate", "vanilla", "strawberry"]
+      red: ["vanilla", "chocolate", "vanilla"],
+      yellow: ["vanilla", "vanilla", "chocolate"],
     },
     components: [
-      {type: "push", flavor: "vanilla"},
-      {type: "push", flavor: "chocolate"},
-      {type: "push", flavor: "strawberry"},
-      {type: "if", condition: "red"},
-      {type: "if", condition: "yellow"},
-      {type: "if", condition: ["vanilla"]},
-      {type: "if", condition: 5},
-    ]
-},
-  21: {
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "chocolate" },
+      { type: "if", condition: "red" },
+      { type: "if", condition: ["vanilla", "vanilla"] },
+      { type: "pop", flavor: undefined },
+    ],
+  },
+  15: {
     mission: {
-      red: ["chocolate", "vanilla", "strawberry", "chocolate", "vanilla", "strawberry"],
-      yellow: ["vanilla", "strawberry", "chocolate", "vanilla", "strawberry", "chocolate"],
-      brown: ["strawberry", "chocolate", "vanilla", "strawberry", "chocolate", "vanilla"],
+      red: ["chocolate", "vanilla", "chocolate", "strawberry"],
+      yellow: ["vanilla", "strawberry", "chocolate"],
     },
     components: [
-      { type: "if", condition: "yellow" },
       { type: "if", condition: "red" },
-      { type: "if", condition: 6 },
-      { type: "if", condition: 7 },
+      { type: "if", condition: 3 },
+      { type: "if", condition: ["chocolate", "vanilla"] },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "chocolate" },
       { type: "push", flavor: "chocolate" },
       { type: "push", flavor: "strawberry" },
       { type: "push", flavor: "vanilla" },
-      { type: "pop", flavor: "chocolate" },
-      { type: "pop", flavor: "vanilla" },
     ],
   },
-  22: {
+  16: {
     mission: {
       red: ["chocolate", "vanilla", "strawberry", "vanilla"],
       yellow: ["strawberry", "vanilla", "chocolate", "vanilla"],
@@ -190,20 +210,89 @@ export const STAGES: Record<number, StageData> = {
       { type: "push", flavor: "vanilla" },
     ],
   },
-  23: {
+  17: {
     mission: {
-      red: ["chocolate", "vanilla", "chocolate", "strawberry"],
-      yellow: ["vanilla","strawberry", "chocolate"],
+      red: ["chocolate", "strawberry", "chocolate", "vanilla"],
+      yellow: [
+        "chocolate",
+        "strawberry",
+        "chocolate",
+        "strawberry",
+        "chocolate",
+        "strawberry",
+        "vanilla",
+      ],
     },
     components: [
-      { type: "if", condition: "red" },
-      { type: "if", condition: 3 },
-      { type: "if", condition: ["chocolate", "vanilla"] },
-      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "vanilla" },
       { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+      { type: "if", condition: 6 },
+      { type: "if", condition: "red" },
+      { type: "if", condition: ["strawberry", "chocolate", "strawberry"] },
+      { type: "pop", flavor: undefined },
+    ],
+  },
+  18: {
+    mission: {
+      red: [
+        "chocolate",
+        "vanilla",
+        "strawberry",
+        "chocolate",
+        "vanilla",
+        "strawberry",
+      ],
+      yellow: [
+        "vanilla",
+        "strawberry",
+        "chocolate",
+        "vanilla",
+        "strawberry",
+        "chocolate",
+      ],
+      brown: [
+        "strawberry",
+        "chocolate",
+        "vanilla",
+        "strawberry",
+        "chocolate",
+        "vanilla",
+      ],
+    },
+    components: [
+      { type: "if", condition: "yellow" },
+      { type: "if", condition: "red" },
+      { type: "if", condition: 6 },
+      { type: "if", condition: 7 },
       { type: "push", flavor: "chocolate" },
       { type: "push", flavor: "strawberry" },
       { type: "push", flavor: "vanilla" },
+      { type: "pop", flavor: "chocolate" },
+      { type: "pop", flavor: "vanilla" },
+    ],
+  },
+  19: {
+    mission: {
+      red: [
+        "chocolate",
+        "strawberry",
+        "chocolate",
+        "strawberry",
+        "chocolate",
+        "strawberry",
+      ],
+      yellow: ["strawberry", "chocolate", "vanilla", "strawberry"],
+      brown: ["chocolate", "vanilla", "strawberry"],
+    },
+    components: [
+      { type: "push", flavor: "vanilla" },
+      { type: "push", flavor: "chocolate" },
+      { type: "push", flavor: "strawberry" },
+      { type: "if", condition: "red" },
+      { type: "if", condition: "yellow" },
+      { type: "if", condition: ["vanilla"] },
+      { type: "if", condition: 5 },
     ],
   },
 };