diff --git a/code_editing/agents/context_providers/aider/aider.py b/code_editing/agents/context_providers/aider/aider.py
index 5a9469a..4102016 100644
--- a/code_editing/agents/context_providers/aider/aider.py
+++ b/code_editing/agents/context_providers/aider/aider.py
@@ -1,3 +1,5 @@
+import tiktoken
+
 from code_editing.agents.context_providers.aider.repo_map import RepoMap, find_src_files
 from code_editing.agents.context_providers.context_provider import ContextProvider
 
@@ -7,10 +9,21 @@ def __init__(self, repo_path: str, data_path: str):
         self.repo_path = repo_path
         self.data_path = data_path
 
+        def count_tokens(text, model="gpt-4o"):
+            # Get the appropriate encoding for the specified model
+            encoding = tiktoken.encoding_for_model(model)
+
+            # Encode the text using the encoding scheme
+            tokens = encoding.encode(text)
+
+            # Return the number of tokens
+            return len(tokens)
+
         self.rm = RepoMap(
             map_tokens=1024,
             root=repo_path,
-            token_count=lambda x: len(x.split()) // 4,
+            token_count=count_tokens,
+            # max_context_window=120000
         )
 
     def get_repo_map(self) -> str: