diff --git a/quest.yml b/quest.yml
index d571885..28155e2 100644
--- a/quest.yml
+++ b/quest.yml
@@ -13,6 +13,8 @@ steps:
   - create_issue
   - create_discussion
   - create_branch
+  - codespace_start
+  - change_codespace_branch
   - pull_request
 skills:
   - git
diff --git a/steps/change_codespace_branch.yml b/steps/change_codespace_branch.yml
new file mode 100644
index 0000000..6aecef5
--- /dev/null
+++ b/steps/change_codespace_branch.yml
@@ -0,0 +1,29 @@
+id: change_codespace_branch
+learningObjectives:
+  - Learn how to switch branches in a Codespace.
+hints:
+startFlow:
+  do:
+    - actionId: bot_message
+      params:
+        person: lucca
+        messages:
+          - text: "Before we make any changes, let's ensure we can work on our new branch in Codespaces."
+          - text: "First, we need to fetch the latest changes from the remote repository."
+          - text: "To do this, click on the `Source Control` icon, then click the `refresh` button."
+          - text: "Next, let's switch to our new branch. To do this, click on the `Source Control` icon, then click the `...` button, select `Checkout to...`, and choose your branch name."
+          - text: "Once you've switched to your branch, let me know so we can continue."
+          - actionId: ready_message
+            params:
+              person: lucca
+
+trigger:
+  type: user_ready_response
+  flowNode:
+    do:
+      - actionId: bot_message
+        params:
+          person: lucca
+          messages:
+            - text: "Great! You are now on your new branch."
+      - actionId: finish_step
diff --git a/steps/create_branch.yml b/steps/create_branch.yml
index c25f32a..e293fe9 100644
--- a/steps/create_branch.yml
+++ b/steps/create_branch.yml
@@ -9,7 +9,8 @@ startFlow:
         person: lucca
         messages:
           - text: So now that we have the color in hand, let's first create a branch for the code change.
-          - text: "Go to the [GitHub repository](${user.repository}), click on branch dropdown (Should be on `main`) and give the new branch with a meaningful name."
+          - text: "Go to the [GitHub repository](${user.repository}), make sure the branch dropdown is set on `main`."
+          - text: "Click on the dropdown and type a branch name with a meaningful name and hit `create branch <your-branch-name> from main`."
           - text: I'll wait here for you to finish.
 
 trigger:
diff --git a/steps/pull_request.yml b/steps/pull_request.yml
index fd13d6a..4737a81 100644
--- a/steps/pull_request.yml
+++ b/steps/pull_request.yml
@@ -17,7 +17,8 @@ startFlow:
                       color: #FFFFFF;
                    } 
                    ```
-          - text: Once you're done, open a pull request , with a meaningful description of your change.
+          - text: Once you're done, open a pull request.
+          - text: On the pull request description, add a brief explanation of the change you made, and add a link to the GitHub issue that this PR is related to.
           - text: I'll be here to review it.
 trigger:
   type: github_pr_lifecycle_status