diff --git a/backend/agent/run.py b/backend/agent/run.py
index 0ee21ff7..39425286 100644
--- a/backend/agent/run.py
+++ b/backend/agent/run.py
@@ -2,11 +2,10 @@ import os
 import json
 import uuid
 from agentpress.thread_manager import ThreadManager
-from agent.tools.files_tool import FilesTool
 from agent.tools.sb_browse_tool import SandboxBrowseTool
 from agent.tools.sb_shell_tool import SandboxShellTool
 from agent.tools.sb_website_tool import SandboxWebsiteTool
-# from agent.tools.search_tool import CodeSearchTool
+from agent.tools.sb_files_tool import SandboxFilesTool
 from typing import Optional
 from agent.prompt import get_system_prompt
 from agentpress.response_processor import ProcessorConfig
@@ -34,12 +33,12 @@ async def run_agent(thread_id: str, stream: bool = True, thread_manager: Optiona
     # thread_manager.add_tool(FilesTool)
     # thread_manager.add_tool(TerminalTool)
     # thread_manager.add_tool(CodeSearchTool)
-    # thread_manager.add_tool(SandboxBrowseTool, sandbox_id=sandbox_id, password=sandbox_password)
+    thread_manager.add_tool(SandboxBrowseTool, sandbox_id=sandbox_id, password=sandbox_password)
     thread_manager.add_tool(SandboxWebsiteTool, sandbox_id=sandbox_id, password=sandbox_password)
-    system_message = {
-        "role": "system",
-        "content": get_system_prompt()
-    }
+    thread_manager.add_tool(SandboxShellTool, sandbox_id=sandbox_id, password=sandbox_password)
+    thread_manager.add_tool(SandboxFilesTool, sandbox_id=sandbox_id, password=sandbox_password)
+
+    system_message = { "role": "system", "content": get_system_prompt() }
 
     # model_name = "anthropic/claude-3-5-sonnet-latest" 
     
@@ -48,7 +47,7 @@ async def run_agent(thread_id: str, stream: bool = True, thread_manager: Optiona
     #groq/deepseek-r1-distill-llama-70b
     #bedrock/anthropic.claude-3-7-sonnet-20250219-v1:0
 
-    files_tool = FilesTool()
+    files_tool = SandboxFilesTool()
 
     files_state = await files_tool.get_workspace_state()