diff --git a/prompts/agent_prompt_generators.py b/prompts/agent_prompt_generators.py
index 71c9d67..2f9d253 100644
--- a/prompts/agent_prompt_generators.py
+++ b/prompts/agent_prompt_generators.py
@@ -187,7 +187,7 @@ def generate_pick_new_goal_guidance()-> str:
         str: A prompt string prompting the LLM to when to go to pick-new-goal
     """
     if is_multi_goal_mode(): 
-        return 'Next should only be "pick-new-goal" if all tools have been run (use the system prompt to figure that out) or the user explicitly requested to pick a new goal.'
+        return 'Next should only be "pick-new-goal" if all tools have been run (use the system prompt to figure that out) or the user explicitly requested to pick a new goal. If next is "pick-new-goal" the tool should always be "ListAgents"'
     else: 
         return 'Next should never be "pick-new-goal".'
 
diff --git a/tools/goal_registry.py b/tools/goal_registry.py
index bf6cdde..5dea149 100644
--- a/tools/goal_registry.py
+++ b/tools/goal_registry.py
@@ -362,8 +362,8 @@ goal_ecomm_order_status = AgentGoal(
     example_conversation_history="\n ".join(
         [
             "user: I'd like to know the status of my order",
-            "agent: Sure! I can help you out with that. May I have your email address or order number?",
-            "user: email is bob.johnson@emailzzz.com ",
+            "agent: Sure! I can help you out with that. May I have your order number?",
+            "user: 102 ",
             "user_confirmed_tool_run: <user clicks confirm on GetOrderStatus tool>",
             "tool_result: { 'id': '102', 'summary': 'Red Sunglasses', 'email': 'matt.murdock@nelsonmurdock.com', 'status': 'shipped', 'order_date': '2025-04-01', 'last_order_update': '2025-04-06', 'tracking_id': '039813852990618' }",
             "agent: Your order 'Red Sunglasses,' placed April 1, 2025, was shipped on April 6, 2025. Would you like to see the tracking inforation?",
diff --git a/workflows/agent_goal_workflow.py b/workflows/agent_goal_workflow.py
index 083332b..20d1b86 100644
--- a/workflows/agent_goal_workflow.py
+++ b/workflows/agent_goal_workflow.py
@@ -178,6 +178,7 @@ class AgentGoalWorkflow:
                     current_tool = tool_data["tool"] = "ListAgents"
                     waiting_for_confirm = True
                     self.confirmed = True
+                    continue
                 
                 # else if the next step is to be done with the conversation such as if the user requests it via asking to "end conversation"
                 elif next_step == "done":