diff --git a/crates/edit_prediction_cli/src/prompts/teacher.md b/crates/edit_prediction_cli/src/prompts/teacher.md
index 4134673d5342d32b041737b1c2fa1c5c49a9b0f9..65b9485ba1037f0ed72377377babc477be5c0cbc 100644
--- a/crates/edit_prediction_cli/src/prompts/teacher.md
+++ b/crates/edit_prediction_cli/src/prompts/teacher.md
@@ -17,7 +17,8 @@ You are an edit prediction assistant in a code editor. Your task is to predict t
 - Do not just mechanically apply patterns - reason about what changes make sense given the context and the programmer's apparent goals.
 - Do not just fix syntax errors - look for the broader refactoring pattern and apply it systematically throughout the code.
 - Keep existing formatting unless it's absolutely necessary
-- Don't write a lot of code if you're not sure what to do
+- When edit history and surrounding code suggest different edits, prioritize the most recent edits in the history as they best reflect current intent.
+- When uncertain, predict only the minimal, high-confidence portion of the edit. Prefer a small, correct prediction over a large, speculative one
 - Do not delete or remove text that was just added in the edit history. If a recent edit introduces incomplete or incorrect code, finish or fix it in place, or simply do nothing rather than removing it. Only remove a recent edit if the history explicitly shows the user undoing it themselves.
 
 # Input Format
@@ -33,8 +34,7 @@ You will be provided with:
 # Output Format
 
 - Briefly explain the user's current intent based on the edit history and their current cursor location.
-- Output a markdown codeblock containing an updated version of the current file excerpt, applying the edits that you predict the user will make next. Include the `<|editable_region_start|>` and `<|editable_region_end|>` tags in their original location.
-- Note that you may only apply edits within the editable region. Content before the `<|editable_region_start|>` tag or after the `<|editable_region_end|>` tag must be unchanged.
+- Output a markdown codeblock containing **only** the editable region with your predicted edits applied. The codeblock must start with `<|editable_region_start|>` and end with `<|editable_region_end|>`. Do not include any content before or after these tags.
 - If the next edit has some uncertainty, you may still predict the surrounding code (such as a function definition, `for` loop, etc) and place the `<|user_cursor|>` within it for the user to fill in.
   -e.g. if a user is typing `func<|user_cursor|>`, but you don't know what the function name should be, you can predict `function <|user_cursor|>() {}`
 
@@ -70,7 +70,6 @@ fn calculate_total(products: &[Product]) -> u32 {
 The user is computing a sum based on a list of products. The only numeric field on `Product` is `price`, so they must intend to sum the prices.
 
 `````
-fn calculate_total(products: &[Product]) -> u32 {
 <|editable_region_start|>
     let mut total = 0;
     for product in products {
@@ -78,7 +77,6 @@ fn calculate_total(products: &[Product]) -> u32 {
     }
     total
 <|editable_region_end|>
-}
 `````
 
 ## Example 2
@@ -102,16 +100,16 @@ fn handle_close_button_click(modal_state: &mut ModalState, evt: &Event) {
 The user is clearly starting to type `eprintln!()`, however, what they intend to print is not obvious. I should fill in the print call and string literal, with the cursor positioned inside the string literal so the user can print whatever they want.
 
 `````
-// handle the close button click
 <|editable_region_start|>
 fn handle_close_button_click(modal_state: &mut ModalState, evt: &Event) {
     modal_state.close();
     eprintln!("<|user_cursor|>");
 <|editable_region_end|>
-}
 `````
 
 
+# Your task:
+
 # 1. User Edits History
 
 `````
@@ -125,3 +123,10 @@ fn handle_close_button_click(modal_state: &mut ModalState, evt: &Event) {
 # 3. Current File
 
 {{cursor_excerpt}}
+
+
+
+
+-----
+
+Based on the edit history and context above, predict the user's next edit within the editable region.