diff --git a/src/chats/serenity.yaml b/src/chats/serenity.yaml
index 416383f..fb5f28f 100644
--- a/src/chats/serenity.yaml
+++ b/src/chats/serenity.yaml
@@ -883,12 +883,22 @@
 - Oh, hello!
 - Look, I'm very busy right now constructing this place.
 - We can talk more once this is done.
+- label: entrypoint
 - Can you spare some oxygen?:
   - Oh, sure thing!
   - script: refilloxygen 1
+- Can I ask you some general questions?:
+  - Of course.
+  - goto: generic_questions
 - Bye!:
   - See you around!
+  - goto: EXIT
+- goto: entrypoint
 
+- label: generic_questions
+- include: generic_questions_serenity
+- Anything else?
+- goto: entrypoint
 
 ---
 
@@ -896,11 +906,22 @@
 - chat: River
 - Welcome to our little oasis!
 - This will be great once it's finished.
+- label: entrypoint
 - Can you spare some oxygen?:
   - Oh, sure thing!
   - script: refilloxygen 1
+- Can I ask you some general questions?:
+  - Of course.
+  - goto: generic_questions
 - Bye!:
   - See you around!
+  - goto: EXIT
+- goto: entrypoint
+
+- label: generic_questions
+- include: generic_questions_serenity
+- Anything else?
+- goto: entrypoint
 
 
 ---