diff --git a/app.py b/app.py
index a0b5349..0d78fe8 100644
--- a/app.py
+++ b/app.py
@@ -1876,8 +1876,6 @@ def loop_through_steps_until_question(
         if not step:
             break
 
-        feedback_tokens_for_ai = step.get("feedback_tokens_for_ai", "")
-
         # Emit the current step content blocks
         if "content_blocks" in step:
             content = "\n\n".join(step["content_blocks"])
@@ -1927,9 +1925,9 @@ def loop_through_steps_until_question(
         )
 
         if next_step:
+            activity_state.attempts = 0
             activity_state.section_id = next_section["section_id"]
             activity_state.step_id = next_step["step_id"]
-            activity_state.attempts = 0
 
             db.session.add(activity_state)
             db.session.commit()
@@ -2471,9 +2469,9 @@ def handle_activity_response(room_name, user_response, username):
                         )
 
                     if next_step:
+                        activity_state.attempts = 0
                         activity_state.section_id = next_section["section_id"]
                         activity_state.step_id = next_step["step_id"]
-                        activity_state.attempts = 0
 
                         db.session.add(activity_state)
                         db.session.commit()
diff --git a/research/activity26-magic-8-ball.yaml b/research/activity26-magic-8-ball.yaml
new file mode 100644
index 0000000..dc4ac51
--- /dev/null
+++ b/research/activity26-magic-8-ball.yaml
@@ -0,0 +1,74 @@
+default_max_attempts_per_step: 1
+sections:
+  - section_id: "section_1"
+    title: "Magic 8 Ball"
+    steps:
+      - step_id: "step_0"
+        title: "Introduction"
+        content_blocks:
+          - "Welcome to the Magic 8 Ball! 🎱"
+          - "Think of a yes or no question and ask the Magic 8 Ball."
+
+      - step_id: "step_1"
+        title: "Ask the Magic 8 Ball"
+        question: "What is your question for the Magic 8 Ball?"
+        tokens_for_ai: |
+          Provide a random response from the Magic 8 Ball's set of answers.
+          If the user wants to change the language, categorize as 'set_language'.
+          If the user wants to exit, categorize as 'exit'.
+        feedback_tokens_for_ai: |
+          Use the user's question to provide a random Magic 8 Ball response.
+          Consider the tone and style of traditional Magic 8 Ball answers.
+        buckets:
+          - ask_question
+          - set_language
+          - exit
+        transitions:
+          ask_question:
+            ai_feedback:
+              tokens_for_ai: |
+                Here is your answer: [random Magic 8 Ball response].
+                Use the user's question to provide a random Magic 8 Ball response.
+                Use emoji at the end of the response to relate.
+                On a new line write two sentences making a joke or relating to the question and the result.
+            metadata_tmp_random:
+              magic_8_ball_response:
+                # Positive answers
+                - "It is certain."
+                - "Without a doubt."
+                - "You may rely on it."
+                - "Yes, definitely."
+                - "As I see it, yes."
+                - "Most likely."
+                - "Outlook good."
+                - "Yes."
+                - "Signs point to yes."
+                - "Absolutely."
+                # Negative answers
+                - "Don't count on it."
+                - "My reply is no."
+                - "My sources say no."
+                - "Outlook not so good."
+                - "Very doubtful."
+                # Vague answers
+                - "Reply hazy, try again."
+                - "Ask again later."
+                - "Better not tell you now."
+                - "Cannot predict now."
+                - "Concentrate and ask again."
+            next_section_and_step: "section_1:step_1"
+          set_language:
+            content_blocks:
+              - "Language preference updated. Please continue in your preferred language."
+            metadata_add:
+              language: "the-users-response"
+            counts_as_attempt: false
+            next_section_and_step: "section_1:step_1"
+          exit:
+            next_section_and_step: "section_1:step_2"
+
+      - step_id: "step_2"
+        title: "Goodbye"
+        content_blocks:
+          - "Thank you for playing with the Magic 8 Ball! 🎉"
+          - "Feel free to come back anytime to ask more questions."