diff --git a/src/tools/README.md b/README_tools.md
similarity index 100%
rename from src/tools/README.md
rename to README_tools.md
diff --git a/src/agentCore.jl b/src/agentCore.jl
index ae7cf38..3540a17 100644
--- a/src/agentCore.jl
+++ b/src/agentCore.jl
@@ -56,9 +56,8 @@ mutable struct yiemAgent <: agent             # High-level agent wrapper
   sessionId::Union{String, Nothing}           # Optional session identifier
   maxRetryDelayMs::Union{Int64, Nothing}      # Maximum delay between retries (ms)
   parallelToolExecute::Bool                   # Default: false
-  agentEventSink::Function                    # agent emits its status via this function
-  _tool_store::Any                            # Reference to the toolStore for runtime registration
- end
+   agentEventSink::Function                    # agent emits its status via this function
+  end
 
 """
 Create a new yiemAgent instance with a background loop task.
@@ -82,17 +81,9 @@ on `inputChannel` and `followUpChannel` channels concurrently.
 - `maxRetryDelayMs::Union{Int64, Nothing}`: Maximum delay between retries in milliseconds (default: `nothing`)
 - `parallelToolExecute::Bool`: Run tool calls in parallel (default: `false`)
 - `agentEventSink::Function`: Callback to receive agent events
-- `tool_store::Union{Any, Nothing}`: toolStore for runtime tool registration (default: `nothing`)
 
 # Returns
 - A new `yiemAgent` instance with an active background task
-
-# Examples
-```julia
-julia> store = toolStore(name="agent1")
-julia> tools = loadTools(store, "src/tools")
-julia> agent = yiemAgent(systemPrompt="You are a helpful assistant", model=my_model, tools=tools, llmCall=..., tool_store=store)
-yiemAgent(agentState(...), Channel(...), Channel(...), Channel(...), ..., store)
 """
 function yiemAgent(
   toolsFolderPath::String,
@@ -104,14 +95,13 @@ function yiemAgent(
   prepareContext::Function=prepareContext,
   formatMsgForLLM::Function=formatMsgForLLM,
   beforeToolCall::Function=beforeToolCall,
-  afterToolCall::Function,  #WORKING
+  afterToolCall::Function=afterToolCall,  #WORKING
   # prepareNextTurn::Union{Function, Nothing}=nothing,
   # prepareNextTurnWithContext::Union{Function, Nothing}=nothing,
   sessionId::Union{String, Nothing}=nothing,
   maxRetryDelayMs::Union{Int64, Nothing}=nothing,
   parallelToolExecute::Bool=false,
   agentEventSink::Function,
-  tool_store::Union{Any, Nothing}=nothing,
   )
   # Create channels: input (user -> agent), followUp (async queue), output (agent -> user)
   inputChannel    = Channel(16)
@@ -140,7 +130,6 @@ function yiemAgent(
     maxRetryDelayMs,
     parallelToolExecute,
     agentEventSink,
-    tool_store,
   )
 
   # Spawn the background loop and attach it
@@ -823,28 +812,28 @@ function finalizeExecutedToolCall(
     signal::Union{Nothing,abortSignal},
 )::finalizedOutcome
 
-    result = executed.result
-    isError = executed.isError
+  result = executed.result
+  isError = executed.isError
 
-    if config.afterToolCall !== nothing
-        try
-            after = config.afterToolCall(
-                afterToolCallContext(assistantMsg, prep.toolCall, prep.args, result, isError, context), signal
-            )
-            if after !== nothing
-                result = merge(result, dict(:content=>get(after,:content,result.content),
-                                            :details=>get(after,:details,result.details),
-                                            :usage=>get(after,:usage,result.usage),
-                                            :terminate=>get(after,:terminate,result.terminate)))
-                isError = get(after, :isError, isError)
-            end
-        catch err
-            result = createErrorToolResult(sprint(showerror, err))
-            isError = true
-        end
+  if config.afterToolCall !== nothing
+    try
+      after = config.afterToolCall(
+        afterToolCallContext(assistantMsg, prep.toolCall, prep.args, result, isError, context), signal
+      )
+      if after !== nothing
+        result = merge(result, dict(:content=>get(after,:content,result.content),
+                                    :details=>get(after,:details,result.details),
+                                    :usage=>get(after,:usage,result.usage),
+                                    :terminate=>get(after,:terminate,result.terminate)))
+        isError = get(after, :isError, isError)
+      end
+    catch err
+      result = createErrorToolResult(sprint(showerror, err))
+      isError = true
     end
+  end
 
-    return finalizedOutcome(prep.toolCall, result, isError)
+  return finalizedOutcome(prep.toolCall, result, isError)
 end
 
 """
diff --git a/src/utils.jl b/src/utils.jl
index 3191473..4a89c4d 100644
--- a/src/utils.jl
+++ b/src/utils.jl
@@ -3,7 +3,7 @@ module utils
 export clearhistory, availableWineToText, prepareContext, formatMsgForLLM, validateRequiredArgs, 
       validateToolArguments, _userMessageToOpenAI, 
       _assistantMessageToOpenAI, _toolResultMessageToOpenAI, _messageContentToBlocks,
-      beforeToolCall
+      beforeToolCall, afterToolCall
 
 using UUIDs, Dates, DataStructures, HTTP, JSON
 using GeneralUtils
@@ -221,7 +221,9 @@ function formatMsgForLLM(ctx::agentContext)::Dict{String, Any}
 end
 
 #TODO
-function beforeToolCall(context::beforeToolCallContext, signal::abortSignal)::beforeToolCallResult
+function beforeToolCall(context::beforeToolCallContext, signal::abortSignal
+  )::beforeToolCallResult
+  
   # final context check
 
   # seek user approval via UI
@@ -232,14 +234,12 @@ function beforeToolCall(context::beforeToolCallContext, signal::abortSignal)::be
 end
 
 #TODO
-function afterToolCall(context::beforeToolCallContext, signal::abortSignal)::beforeToolCallResult
-  # final context check
+function afterToolCall(context::beforeToolCallContext, signal::abortSignal
+  )::Union{agentToolResult, Nothing}
 
-  # seek user approval via UI
-
-  # other check
+  # modify context.result if needed and return agentToolResult
   
-  return beforeToolCallResult(false, "N/A")
+  return nothing
 end