diff --git a/src/interface.jl b/src/interface.jl
index c662a71..10aaf20 100755
--- a/src/interface.jl
+++ b/src/interface.jl
@@ -510,12 +510,13 @@ function genPrompt_mistral_openorca(a::agentReflex, usermsg::String) #WORKING
   {current status}
   {longterm memory}
   """
-  prompt = replace(prompt, "{earlierConversation}" => "My earlier talk with the user:\n$(a.earlierConversation)")
-  prompt = replace(prompt, "{current status}" => "")
-  prompt = replace(prompt, "{longterm memory}" => "")
+  context = replace(context, "{earlierConversation}" => "My earlier talk with the user:\n$(a.earlierConversation)")
+  context = replace(context, "{current status}" => "")
+  context = replace(context, "{longterm memory}" => "")
 
-  prompt *= "<|im_start|>user\nQuestion: " * usermsg * "\n<|im_end|>\n"
-  prompt *= "<|im_start|>assistant\n"
+  prompt = replace(prompt, "{context}" => context)
+
+  prompt = replace(prompt, "{usermsg}" => "Question: $usermsg")
   
   return prompt
 end
@@ -586,17 +587,6 @@ function genPrompt_planning_mistral_openorca(a::agentReflex, usermsg::String) #W
   return prompt
 end
 
-function composeContext(a::agentReflex)
-  context = 
-  """
-  {earlierConversation}
-  {current status}
-  {shortterm memory}
-  {longterm memory}
-  """
-
-
-end
 
 """
   Chat with llm.