diff --git a/core/graphAgent.py b/core/graphAgent.py
index 5430abf..b0364f6 100644
--- a/core/graphAgent.py
+++ b/core/graphAgent.py
@@ -16,43 +16,24 @@
 class Graph:
     def __init__(self):
         LANGCHAIN_TRACING_V2: str = "true"
-        llm = SimpleAgent.llm
-        proof_reader = graphtool.create_agent(
-            llm,
-            get_tools(),
-            system_message="You should proof read the text before you send it to the user.",
-        )
-        proof_read_node = functools.partial(graphtool.agent_node, agent=proof_reader, name="proof_reader")
-        simple_agent = graphtool.create_agent(
-            llm,
-            get_tools(),
-            system_message="You should take the input of the user and use the tools available to you to generate a response.",
-        )   
-        simple_agent_node = functools.partial(graphtool.agent_node, agent=simple_agent, name="simple_agent")
-        tool_node = ToolNode(get_tools())
+        
+        self.llm = SimpleAgent.llm
+        self.llm_with_tools = self.llm.bind_tools(get_tools())
+
         self.workflow = StateGraph(GraphState)
-        # Adding nodes to the workflow
-        self.workflow.add_node("simple_agent", simple_agent_node)
-        self.workflow.add_node("proof_reader", proof_read_node)
-        self.workflow.add_node("call_tool", tool_node)
-        # TODO: Visualize these tools
 
-        # Defining edges between nodes
-        self.workflow.add_conditional_edges(
-                    "simple_agent",
-                    graphtool.router,
-                    {"continue": "proof_reader", "call_tool": "call_tool"},
-                )       
-        
-        self.workflow.add_edge("call_tool", "simple_agent")
-        self.workflow.add_edge("simple_agent", "proof_reader")
+        self.workflow.add_node("chatbot", self.chatbot)
+        self.workflow.add_node("tools", ToolNode(get_tools()))
 
+        self.workflow.add_edge(START, "chatbot")
+        self.workflow.add_edge("tools", "chatbot")
+        self.workflow.add_edge("chatbot", END)
 
-        self.workflow.add_edge(START, "simple_agent")
-        self.workflow.add_edge("proof_reader", END)
-        
         # Defining conditional edges
-      
+        self.workflow.add_conditional_edges(
+            "chatbot",
+            tools_condition
+        )
         self.graph = self.workflow.compile()
 
         with open("graph_node_network.png", 'wb') as f:
@@ -86,21 +67,20 @@ async def run(self, user_prompt: str, socketio):
             input = {"messages": [("human", user_prompt)]}
             socketio.emit("start_message", " ")
             async for event in self.graph.astream_events(input, version='v2'):
-                #print(event)
                 event_type = event.get('event')
 
                 # Focuses only on the 'on_chain_stream'-events. 
                 # There may be better events to base the response on
                 if event_type == 'on_chain_stream' and event['name'] == 'LangGraph':
                     chunk = event['data']['chunk']
-                    if 'simple_agent' in chunk:
-                        ai_message = event['data']['chunk']['simple_agent']['messages'][-1]
+                    if 'chatbot' in chunk:
+                        ai_message = event['data']['chunk']['chatbot']['messages'][-1]
 
                         if isinstance(ai_message, AIMessage):
-                            if 'call_tool' in ai_message.additional_kwargs:
-                                tool_call = ai_message.additional_kwargs['call_tool'][0]['function']
-                                #function = tool_calls['function']
-                                socketio.emit("call_tool", tool_call)
+                            if 'tool_calls' in ai_message.additional_kwargs:
+                                tool_call = ai_message.additional_kwargs['tool_calls'][0]['function']
+                                #tool_call_id = ai_message.additional_kwargs['call_tool'][0]['tool_call_id']
+                                socketio.emit("tool_call", tool_call)
                                 continue
                         
                             socketio.emit("chunk", ai_message.content)
@@ -117,23 +97,4 @@ async def run(self, user_prompt: str, socketio):
             return "success"
         except Exception as e:
             print(e)
-            return "error"
-
-        # for event in self.graph.stream(input):
-            #print(event)
-            # for value in event.values():
-            #     messages = value["messages"][-1]
-            #     gathered = ""
-            #     # if messages.content and not isinstance(messages, HumanMessage):
-            #     #     print(messages.content, end="|", flush=True)
-
-            #     if isinstance(messages, AIMessageChunk):
-            #         if first:
-            #             gathered = messages
-            #             first = False
-            #         else:
-            #             gathered += messages
-
-            #     if isinstance(messages, BaseMessage):
-            #         total_tokens = messages.usage_metadata.get('total_tokens', 0)
-            #         return messages.content, total_tokens
\ No newline at end of file
+            return "error"
\ No newline at end of file