diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json
index 3291c1926..aaf06ba98 100644
--- a/model_prices_and_context_window.json
+++ b/model_prices_and_context_window.json
@@ -1,41 +1,41 @@
 {
     "gpt-3.5-turbo": {
-        "max_tokens": 4000,
+        "max_tokens": 4097,
         "input_cost_per_token": 0.0000015,
         "output_cost_per_token": 0.000002
     },
     "gpt-3.5-turbo-0613": {
-        "max_tokens": 4000,
+        "max_tokens": 4097,
         "input_cost_per_token": 0.0000015,
         "output_cost_per_token": 0.000002
     },
     "gpt-3.5-turbo-0301": {
-        "max_tokens": 4000,
+        "max_tokens": 4097,
         "input_cost_per_token": 0.0000015,
         "output_cost_per_token": 0.000002
     },
     "gpt-3.5-turbo-16k": {
-        "max_tokens": 16000,
+        "max_tokens": 16385,
         "input_cost_per_token": 0.000003,
         "output_cost_per_token": 0.000004
     },
     "gpt-3.5-turbo-16k-0613": {
-        "max_tokens": 16000,
+        "max_tokens": 16385,
         "input_cost_per_token": 0.000003,
         "output_cost_per_token": 0.000004
     },
     "gpt-4": {
-        "max_tokens": 8000,
+        "max_tokens": 8192,
         "input_cost_per_token": 0.000003,
         "output_cost_per_token": 0.00006
     },
     "gpt-4-0613": {
-        "max_tokens": 8000,
+        "max_tokens": 8192,
         "input_cost_per_token": 0.000003,
         "output_cost_per_token": 0.00006
     },
     "gpt-4-32k": {
-        "max_tokens": 8000,
+        "max_tokens": 32768,
         "input_cost_per_token": 0.00006,
         "output_cost_per_token": 0.00012
     },