diff --git a/docs/src/components/Content.astro b/docs/src/components/Content.astro
index 05c66ee..0bfc0fe 100644
--- a/docs/src/components/Content.astro
+++ b/docs/src/components/Content.astro
@@ -3,7 +3,7 @@ import type { Props } from '@astrojs/starlight/props';
 import Default from '@astrojs/starlight/components/MarkdownContent.astro';
 
 const slug = Astro.props.slug;
-const renderCommentSection = !(['', 'challenges/testing', 'challenges/angular-performance']).includes(slug)
+const renderCommentSection = !Astro.props.entry.data.noCommentSection;
 ---
 
 
@@ -12,6 +12,8 @@ const renderCommentSection = !(['', 'challenges/testing', 'challenges/angular-pe
 
 <div class="border-t"></div>
 
+{Astro.props.entry.data.custom}
+
 { renderCommentSection
  ?
    <script src="https://giscus.app/client.js"
diff --git a/docs/src/content/config.ts b/docs/src/content/config.ts
index 02ea2ac..17ff562 100644
--- a/docs/src/content/config.ts
+++ b/docs/src/content/config.ts
@@ -1,7 +1,13 @@
-import { defineCollection } from 'astro:content';
 import { docsSchema, i18nSchema } from '@astrojs/starlight/schema';
+import { defineCollection, z } from 'astro:content';
 
 export const collections = {
-  docs: defineCollection({ schema: docsSchema() }),
+  docs: defineCollection({
+    schema: (ctx) =>
+      docsSchema()(ctx).extend({
+        // Add a new optional field to the schema.
+        noCommentSection: z.boolean().optional(),
+      }),
+  }),
   i18n: defineCollection({ type: 'data', schema: i18nSchema() }),
 };
diff --git a/docs/src/content/docs/challenges/angular-performance/37-ngfor-biglist.md b/docs/src/content/docs/challenges/angular-performance/37-ngfor-biglist.md
index 05ef8e7..84e28f3 100644
--- a/docs/src/content/docs/challenges/angular-performance/37-ngfor-biglist.md
+++ b/docs/src/content/docs/challenges/angular-performance/37-ngfor-biglist.md
@@ -1,7 +1,6 @@
 ---
 title: 🟠 Optimize Big List
 description: Challenge 37 is about learning how virtualization optimize big list rendering
-toto: skldfjklsdlfkj
 sidebar:
   order: 117
   badge: New
diff --git a/docs/src/content/docs/challenges/angular-performance/index.mdx b/docs/src/content/docs/challenges/angular-performance/index.mdx
index df17f46..27af452 100644
--- a/docs/src/content/docs/challenges/angular-performance/index.mdx
+++ b/docs/src/content/docs/challenges/angular-performance/index.mdx
@@ -3,6 +3,7 @@ title: Angular Performance
 prev: false
 next: false
 description: Learn how to use the Angular Devtool chrome extension.
+noCommentSection: true
 sidebar:
   order: 1
 ---
diff --git a/docs/src/content/docs/challenges/testing/index.mdx b/docs/src/content/docs/challenges/testing/index.mdx
index 6149b73..730f50c 100644
--- a/docs/src/content/docs/challenges/testing/index.mdx
+++ b/docs/src/content/docs/challenges/testing/index.mdx
@@ -3,6 +3,7 @@ title: Testing
 prev: false
 next: false
 description: Introduction to testing challenges.
+noCommentSection: true
 sidebar:
   order: 1
 ---
diff --git a/docs/src/content/docs/index.mdx b/docs/src/content/docs/index.mdx
index 80e2ce9..942ba79 100644
--- a/docs/src/content/docs/index.mdx
+++ b/docs/src/content/docs/index.mdx
@@ -2,6 +2,7 @@
 title: Welcome to Angular Challenges
 description: Get started by resolving those challenges and becoming a better Angular FrontEnd engineer.
 template: splash
+noCommentSection: true
 hero:
   tagline: Start now and become an Angular Expert!
   image: