diff --git a/lessons/01-intro-to-genai/solution/solution-quiz.md b/lessons/01-intro-to-genai/solution/solution-quiz.md
index 0d35ba99..c1ff6d3b 100644
--- a/lessons/01-intro-to-genai/solution/solution-quiz.md
+++ b/lessons/01-intro-to-genai/solution/solution-quiz.md
@@ -1,6 +1,44 @@
+## Quick Quiz: Test Your Knowledge!
-1) **Incorrect**: Generative AI can generate text, images, and even code.
+### β Question 1:
+Generative AI can generate text, images, and even code.
-2) **Correct**: JavaScript can be used for both front-end and back-end development.
+
+ Is this correct?
-3) **Incorrect**: Python is not the only language that can be used for AI development. It can be argued that Python is the most popular language for AI development, but other languages/frameworks like JavaScript, Java and Python are also a very popular choices for AI development.
\ No newline at end of file
+β **Incorrect.**
+
+π **Explanation:** While the statement is factually true, it's not incorrect in a quiz context. However, to improve clarity and precision:
+
+β
**Better Version:**
+Generative AI is capable of generating a variety of content such as text, images, and even code, depending on the model and its training data.
+
+
+---
+
+### β Question 2:
+JavaScript can be used for both front-end and back-end development.
+
+
+ Is this correct?
+
+β
**Correct.**
+
+π‘ **Explanation:** JavaScript is a versatile language that powers both front-end (via browsers) and back-end (via Node.js) development.
+
+
+---
+
+### β Question 3:
+Python is not the only language that can be used for AI development. It can be argued that Python is the most popular language for AI development, but other languages/frameworks like JavaScript, Java and Python are also a very popular choices for AI development.
+
+
+ Is this correct?
+
+β **Incorrect.**
+
+π **Explanation:** There are grammatical issues and repetition in this sentence (e.g., Python is mentioned twice and βa very popular choicesβ is incorrect).
+
+β
**Corrected Version:**
+Python is not the only language used for AI development. While it is arguably the most popular, other languages and frameworks such as JavaScript and Java are also widely used for developing AI applications.
+
diff --git a/lessons/02-first-ai-app/solution/solution-quiz.md b/lessons/02-first-ai-app/solution/solution-quiz.md
index 01bceeac..1491f54d 100644
--- a/lessons/02-first-ai-app/solution/solution-quiz.md
+++ b/lessons/02-first-ai-app/solution/solution-quiz.md
@@ -1,2 +1,11 @@
-
-Correct: A, B
\ No newline at end of file
+### β Question:
+
+### What is the purpose of the context window in generative AI models?
+
+
+ β
Answer
+
+ * **A. The context window allows the AI to consider more context and generate more coherent responses.**
+ * **B. The context window is the number of previous messages that the AI uses to generate a response.**
+
+
\ No newline at end of file
diff --git a/lessons/03-prompt-engineering/solution/solution-quiz.md b/lessons/03-prompt-engineering/solution/solution-quiz.md
index 4a2ffcca..e28b4375 100644
--- a/lessons/03-prompt-engineering/solution/solution-quiz.md
+++ b/lessons/03-prompt-engineering/solution/solution-quiz.md
@@ -1,3 +1,11 @@
-
+### β Question:
-**Correct: B, C**
\ No newline at end of file
+### What is prompt engineering?
+
+
+ β
Answer
+
+ * **B. Prompt engineering is about crafting the right prompts to get the desired output from a language model.**
+ * **C. Prompt engineering is about training a model to recognize patterns in data.**
+
+
\ No newline at end of file
diff --git a/lessons/04-structured-output/solution/solution-quiz.md b/lessons/04-structured-output/solution/solution-quiz.md
index 4a71f66f..1240fe14 100644
--- a/lessons/04-structured-output/solution/solution-quiz.md
+++ b/lessons/04-structured-output/solution/solution-quiz.md
@@ -1,3 +1,11 @@
-The answer is:
+### β Question:
-answer: A, B
\ No newline at end of file
+### What is structured output used for ?
+
+
+ β
Answer
+
+ * **A. Presenting information in a structured manner.**
+ * **B. Extracting data from prompts.**
+
+
\ No newline at end of file
diff --git a/lessons/05-rag/solution/solution-quiz.md b/lessons/05-rag/solution/solution-quiz.md
index c15e347c..3011efa1 100644
--- a/lessons/05-rag/solution/solution-quiz.md
+++ b/lessons/05-rag/solution/solution-quiz.md
@@ -1 +1,10 @@
-Answer: C
\ No newline at end of file
+### β Question:
+
+### What is the role of the retriever in a RAG system?
+
+
+ β
Answer
+
+ * **C. The retriever finds relevant information from external data sources.**
+
+
\ No newline at end of file
diff --git a/lessons/06-tool-calling/solution/solution-quiz.md b/lessons/06-tool-calling/solution/solution-quiz.md
index 79ec8675..1bc510c9 100644
--- a/lessons/06-tool-calling/solution/solution-quiz.md
+++ b/lessons/06-tool-calling/solution/solution-quiz.md
@@ -1,29 +1,38 @@
+### β Question 1:
+### What is the purpose of registering a tool with the AI model?
-**Question:**
-What is the purpose of registering a tool with the AI model?
+
+ β
Answer
-A. To allow the AI model to directly execute the tool without developer intervention.
-B. To provide metadata about the tool so the AI model can suggest its usage.
-C. To replace the need for defining functions in the code.
+ * **B. To provide metadata about the tool so the AI model can suggest its usage.**
-**Correct Answer:** B
+
-**Question:**
-What is the role of tool metadata in tool calling?
+---
-A. It describes the tool's purpose, inputs, and outputs for the AI model.
-B. It provides the AI model with the tool's implementation details.
-C. It ensures the tool is executed automatically by the AI model.
+### β Question 2:
-**Correct Answer:** B
-Explanation: Tool metadata describes the tool's purpose, inputs, and outputs for the AI model to suggest its usage.
+### What is the role of tool metadata in tool calling?
-**Question:**
-Why do tool calling?
+
+ β
Answer
-A. To enable the AI model to perform tasks beyond its built-in capabilities by leveraging external functions.
-B. To replace the need for human intervention in AI model development.
-C. To allow the AI model to execute tools without requiring metadata.
+ * **B. It provides the AI model with the tool's implementation details.**
+
+ π‘ **Explanation:** Tool metadata describes the tool's purpose, inputs, and outputs for the AI model to suggest its usage.
-**Correct Answer:** A
\ No newline at end of file
+
+
+---
+
+### β Question 3:
+
+### Why use tool calling?
+
+
+ β
Answer
+
+ * **A. To enable the AI model to perform tasks beyond its built-in capabilities by leveraging external functions.**
+
+
\ No newline at end of file