diff --git a/Avoiding-pitfalls.md b/Avoiding-pitfalls.md
index 9239f94..bdd7e41 100644
--- a/Avoiding-pitfalls.md
+++ b/Avoiding-pitfalls.md
@@ -13,7 +13,7 @@ There are basically two reasons why they may fail:
 
 So, if you are sure the JSON string is correct and you still can't parse it, you should try to increase the size of the `StaticJsonBuffer`.
 
-You can use the [JsonBuffer size calculator](https://bblanchon.github.io/ArduinoJson/) to compute the required size.
+You can use the [ArduinoJson Assistant](https://bblanchon.github.io/ArduinoJson/assistant/) to compute the required size.
 
 #### 2. Make sure everything fits in memory
 
@@ -55,7 +55,7 @@ For this reason, **you should not use a global variable** for your `JsonBuffer`.
 
 The best practice is to **declare it in a local scope**, so that it's discarded as soon as possible. My advice is to declare it in a function whose unique role is to handle the JSON serialization.
 
-See [FAQ: The first parsing succeeds, why does the next ones fail?](https://github.com/bblanchon/ArduinoJson/wiki/FAQ#the-first-parsing-succeeds-why-does-the-next-ones-fail)
+See [FAQ: The first parsing succeeds, why does the next ones fail?](https://bblanchon.github.io/ArduinoJson/faq/the-first-parsing-succeeds-why-does-the-next-ones-fail)
 
 #### 5. Keep the JSON string in memory long enough