diff --git a/public/core-contributors/cat.png b/public/core-contributors/cat.png
new file mode 100644
index 0000000..3db64d3
Binary files /dev/null and b/public/core-contributors/cat.png differ
diff --git a/public/core-contributors/coinmandeer.png b/public/core-contributors/coinmandeer.png
new file mode 100644
index 0000000..e6dd37e
Binary files /dev/null and b/public/core-contributors/coinmandeer.png differ
diff --git a/public/core-contributors/mf.png b/public/core-contributors/mf.png
new file mode 100644
index 0000000..0213a94
Binary files /dev/null and b/public/core-contributors/mf.png differ
diff --git a/public/speakers/guy.png b/public/core-contributors/michael-parenti.png
similarity index 100%
rename from public/speakers/guy.png
rename to public/core-contributors/michael-parenti.png
diff --git a/public/core-contributors/michael.png b/public/core-contributors/michael.png
new file mode 100644
index 0000000..3624eae
Binary files /dev/null and b/public/core-contributors/michael.png differ
diff --git a/public/core-contributors/mykola-siusko.png b/public/core-contributors/mykola-siusko.png
new file mode 100644
index 0000000..82c5177
Binary files /dev/null and b/public/core-contributors/mykola-siusko.png differ
diff --git a/public/core-contributors/odd.png b/public/core-contributors/odd.png
new file mode 100644
index 0000000..6eefaa7
Binary files /dev/null and b/public/core-contributors/odd.png differ
diff --git a/public/core-contributors/robert.png b/public/core-contributors/robert.png
new file mode 100644
index 0000000..83880f5
Binary files /dev/null and b/public/core-contributors/robert.png differ
diff --git a/public/speakers/ahmed.png b/public/speakers/ahmed.png
deleted file mode 100644
index 836f9d7..0000000
Binary files a/public/speakers/ahmed.png and /dev/null differ
diff --git a/public/speakers/ameen.png b/public/speakers/ameen.png
deleted file mode 100644
index a7304e3..0000000
Binary files a/public/speakers/ameen.png and /dev/null differ
diff --git a/public/speakers/image-8.png b/public/speakers/image-8.png
deleted file mode 100644
index acb67ce..0000000
Binary files a/public/speakers/image-8.png and /dev/null differ
diff --git a/public/speakers/image-9.png b/public/speakers/image-9.png
deleted file mode 100644
index 6af97fe..0000000
Binary files a/public/speakers/image-9.png and /dev/null differ
diff --git a/public/speakers/scottmoore.png b/public/speakers/scottmoore.png
deleted file mode 100644
index 9acdcc4..0000000
Binary files a/public/speakers/scottmoore.png and /dev/null differ
diff --git a/public/speakers/jaromil.png b/public/testimonials/jaromil.png
similarity index 100%
rename from public/speakers/jaromil.png
rename to public/testimonials/jaromil.png
diff --git a/src/components/AboutFooter.astro b/src/components/AboutFooter.astro
index 1e62d98..8a1a148 100644
--- a/src/components/AboutFooter.astro
+++ b/src/components/AboutFooter.astro
@@ -103,8 +103,8 @@ const sortedSections = sectionsConfig
           <h1 class="my-6 glitch-text">Core Contributors</h1>
           <SpeakerGrid
             people={core.people}
-            team={core.teams["core-team"]}
-            core={true}
+            team={core.teams["core-contributors"]}
+            core={false}
           />
         </div>
       )}
diff --git a/src/components/SliderTestimonial.astro b/src/components/SliderTestimonial.astro
index af251a5..294d448 100644
--- a/src/components/SliderTestimonial.astro
+++ b/src/components/SliderTestimonial.astro
@@ -6,7 +6,7 @@ const testimonials = [
     designation: "Hacktivist, Founder & Director at Dyne.org Foundation",
     reviewText:
       "Privacy-by-design is the best way to approach the web3 frontier and develop something that empowers people and builds the critical mass for its sustainability. Web3Privacy Now focuses on the best possible goals for crypto developments: privacy, independence and decentralisation.",
-    imageUrl: "/testimonials/jaromil.jpg",
+    imageUrl: "/testimonials/jaromil.png",
   },
   {
     id: "hackguru",
@@ -14,8 +14,7 @@ const testimonials = [
     designation: "Developer Relation at Waku",
     reviewText:
       "They have been organising amazing pro-privacy initiatives. Been a big fan and excited to continue contributing to this amazing community : )",
-      imageUrl: "/testimonials/hack-guru.jpg",
-
+    imageUrl: "/testimonials/hack-guru.jpg",
   },
   {
     id: "lunar-dao",
@@ -23,7 +22,7 @@ const testimonials = [
     designation: null,
     reviewText:
       "A catalyst leading a brilliant charge into privacy content for the web3 ecosystem.",
-      imageUrl: "/testimonials/lunar-dao.jpg",
+    imageUrl: "/testimonials/lunar-dao.jpg",
   },
   {
     id: "amit-chaudhary",
@@ -31,7 +30,7 @@ const testimonials = [
     designation: "Founder Labyrinth, Ex Head of DeFi Research Polygon",
     reviewText:
       "This is the best community for privacy that unites people to collaborate and turns user privacy into reality with exciting narratives.",
-      imageUrl: "/testimonials/amit-chaudhary.jpg",
+    imageUrl: "/testimonials/amit-chaudary.jpg",
   },
   {
     id: "andreea",
@@ -39,7 +38,7 @@ const testimonials = [
     designation: null,
     reviewText:
       "I loved the event, the place, the people, the conversations, the swag. You guys are incredible! I think I won’t be attending other crypto events that much anymore.",
-      imageUrl: "/testimonials/andreea.jpg",
+    imageUrl: "/testimonials/andreea.jpg",
   },
   {
     id: "cryptocanal",
@@ -47,7 +46,7 @@ const testimonials = [
     designation: null,
     reviewText:
       "One event at a time, they are building an ecosystem to ensure that no one forgets the political frontiers being pushed by crypto. Web3Privacy Now has been rallying support and ensuring that privacy holds a prime spot at all the major conferences worldwide.",
-      imageUrl: "/testimonials/cryptocanal.jpg",
+    imageUrl: "/testimonials/cryptocanal.jpg",
   },
   {
     id: "matteo-tambussi",
@@ -55,8 +54,7 @@ const testimonials = [
     designation: "Founder of Spaghetteth, Project Manager StakeCapital",
     reviewText:
       "The balance between Transparency and Privacy, accountable and unaccountable, manifest and secret, convex and concave, 1 and 0 is one of the most fun puzzles blockchain tech has to solve for the world. W3P community approaches this with incredible humility and an unravel-the-knot open debate approach. Also I like how they dress.",
-      imageUrl: "/testimonials/matto-tambussi.jpg",
-
+    imageUrl: "/testimonials/matteo-tambussi.jpg",
   },
   {
     id: "pie-man",
@@ -64,13 +62,12 @@ const testimonials = [
     designation: "Co-Founder Fairblock Network",
     reviewText:
       "Most bullish event by far in EthCC was Web3Privacy Now: right in the middle of the park without anything fancy going on, the only incentive to stay was lovely people with extreme passion for deep but practical steps, cryptography, and amazing applications.",
-      imageUrl: "/testimonials/pie-man.jpg",
-
+    imageUrl: "/testimonials/pie-man.jpg",
   },
 ];
 
 // Usage
-let currentTestimonial = 1;
+let currentTestimonial = 0;
 ---
 
 <div class="w-full mx-auto px-8 border-2 border-[#202020]">
@@ -148,76 +145,71 @@ let currentTestimonial = 1;
 <script>
   document.addEventListener("DOMContentLoaded", function () {
     const testimonials = [
-  {
-    id: "jaromil",
-    author: "Jaromil",
-    designation: "Hacktivist, Founder & Director at Dyne.org Foundation",
-    reviewText:
-      "Privacy-by-design is the best way to approach the web3 frontier and develop something that empowers people and builds the critical mass for its sustainability. Web3Privacy Now focuses on the best possible goals for crypto developments: privacy, independence and decentralisation.",
-    imageUrl: "/testimonials/jaromil.jpg",
-  },
-  {
-    id: "hackguru",
-    author: "HackGuru",
-    designation: "Developer Relation at Waku",
-    reviewText:
-      "They have been organising amazing pro-privacy initiatives. Been a big fan and excited to continue contributing to this amazing community : )",
-      imageUrl: "/testimonials/hack-guru.jpg",
-
-  },
-  {
-    id: "lunar-dao",
-    author: "Lunar Dao",
-    designation: null,
-    reviewText:
-      "A catalyst leading a brilliant charge into privacy content for the web3 ecosystem.",
-      imageUrl: "/testimonials/lunar-dao.jpg",
-  },
-  {
-    id: "amit-chaudhary",
-    author: "Amit Chaudhary",
-    designation: "Founder Labyrinth, Ex Head of DeFi Research Polygon",
-    reviewText:
-      "This is the best community for privacy that unites people to collaborate and turns user privacy into reality with exciting narratives.",
-      imageUrl: "/testimonials/amit-chaudhary.jpg",
-  },
-  {
-    id: "andreea",
-    author: "Andreea",
-    designation: null,
-    reviewText:
-      "I loved the event, the place, the people, the conversations, the swag. You guys are incredible! I think I won’t be attending other crypto events that much anymore.",
-      imageUrl: "/testimonials/andreea.jpg",
-  },
-  {
-    id: "cryptocanal",
-    author: "CryptoCanal",
-    designation: null,
-    reviewText:
-      "One event at a time, they are building an ecosystem to ensure that no one forgets the political frontiers being pushed by crypto. Web3Privacy Now has been rallying support and ensuring that privacy holds a prime spot at all the major conferences worldwide.",
-      imageUrl: "/testimonials/cryptocanal.jpg",
-  },
-  {
-    id: "matteo-tambussi",
-    author: "Matteo Tambussi",
-    designation: "Founder of Spaghetteth, Project Manager StakeCapital",
-    reviewText:
-      "The balance between Transparency and Privacy, accountable and unaccountable, manifest and secret, convex and concave, 1 and 0 is one of the most fun puzzles blockchain tech has to solve for the world. W3P community approaches this with incredible humility and an unravel-the-knot open debate approach. Also I like how they dress.",
-      imageUrl: "/testimonials/matto-tambussi.jpg",
-
-  },
-  {
-    id: "pie-man",
-    author: "Pie Man",
-    designation: "Co-Founder Fairblock Network",
-    reviewText:
-      "Most bullish event by far in EthCC was Web3Privacy Now: right in the middle of the park without anything fancy going on, the only incentive to stay was lovely people with extreme passion for deep but practical steps, cryptography, and amazing applications.",
-      imageUrl: "/testimonials/pie-man.jpg",
-
-  },
-];
-
-
+      {
+        id: "jaromil",
+        author: "Jaromil",
+        designation: "Hacktivist, Founder & Director at Dyne.org Foundation",
+        reviewText:
+          "Privacy-by-design is the best way to approach the web3 frontier and develop something that empowers people and builds the critical mass for its sustainability. Web3Privacy Now focuses on the best possible goals for crypto developments: privacy, independence and decentralisation.",
+        imageUrl: "/testimonials/jaromil.png",
+      },
+      {
+        id: "hackguru",
+        author: "HackGuru",
+        designation: "Developer Relation at Waku",
+        reviewText:
+          "They have been organising amazing pro-privacy initiatives. Been a big fan and excited to continue contributing to this amazing community : )",
+        imageUrl: "/testimonials/hack-guru.jpg",
+      },
+      {
+        id: "lunar-dao",
+        author: "Lunar Dao",
+        designation: null,
+        reviewText:
+          "A catalyst leading a brilliant charge into privacy content for the web3 ecosystem.",
+        imageUrl: "/testimonials/lunar-dao.jpg",
+      },
+      {
+        id: "amit-chaudhary",
+        author: "Amit Chaudhary",
+        designation: "Founder Labyrinth, Ex Head of DeFi Research Polygon",
+        reviewText:
+          "This is the best community for privacy that unites people to collaborate and turns user privacy into reality with exciting narratives.",
+        imageUrl: "/testimonials/amit-chaudary.jpg",
+      },
+      {
+        id: "andreea",
+        author: "Andreea",
+        designation: null,
+        reviewText:
+          "I loved the event, the place, the people, the conversations, the swag. You guys are incredible! I think I won’t be attending other crypto events that much anymore.",
+        imageUrl: "/testimonials/andreea.jpg",
+      },
+      {
+        id: "cryptocanal",
+        author: "CryptoCanal",
+        designation: null,
+        reviewText:
+          "One event at a time, they are building an ecosystem to ensure that no one forgets the political frontiers being pushed by crypto. Web3Privacy Now has been rallying support and ensuring that privacy holds a prime spot at all the major conferences worldwide.",
+        imageUrl: "/testimonials/cryptocanal.jpg",
+      },
+      {
+        id: "matteo-tambussi",
+        author: "Matteo Tambussi",
+        designation: "Founder of Spaghetteth, Project Manager StakeCapital",
+        reviewText:
+          "The balance between Transparency and Privacy, accountable and unaccountable, manifest and secret, convex and concave, 1 and 0 is one of the most fun puzzles blockchain tech has to solve for the world. W3P community approaches this with incredible humility and an unravel-the-knot open debate approach. Also I like how they dress.",
+        imageUrl: "/testimonials/matteo-tambussi.jpg",
+      },
+      {
+        id: "pie-man",
+        author: "Pie Man",
+        designation: "Co-Founder Fairblock Network",
+        reviewText:
+          "Most bullish event by far in EthCC was Web3Privacy Now: right in the middle of the park without anything fancy going on, the only incentive to stay was lovely people with extreme passion for deep but practical steps, cryptography, and amazing applications.",
+        imageUrl: "/testimonials/pie-man.jpg",
+      },
+    ];
     let currentTestimonial = 0;
 
     const container = document.getElementById("testimonial-container");
diff --git a/src/components/SpeakerGrid.astro b/src/components/SpeakerGrid.astro
index a119fe0..353ada0 100644
--- a/src/components/SpeakerGrid.astro
+++ b/src/components/SpeakerGrid.astro
@@ -2,14 +2,14 @@
 const { people, team, core } = Astro.props;
 
 // Filter based on the `core` parameter
-const members = people.filter((p) => {
-  console.log(p)
+const members = core ? people.filter((p) => {
  return  team.includes(p.id)
-}).filter((p) => p.imageUrl);
+}).filter((p) => p.imageUrl) : team;
 
 // const filteredPeople = members.filter((p) => p.imageUrl).slice(0, 12);
 const filteredPeople = members.filter((p) => p.imageUrl);
 
+console.log(filteredPeople)
 function personLink(person) {
   if (person.refs?.twitter) {
     return `https://twitter.com/${person.refs.twitter}`;
@@ -48,6 +48,9 @@ function personLink(person) {
         </a>
         <div class="mt-4">
           <h3 class="text-xs md:text-[16px] font-bold leading-9">{person.name}</h3>
+          <p class="text-xs text-gray-500">
+            {person.caption}
+            </p>
           {person.refs && (
             <p class="text-xs text-gray-500">
               {person.refs.twitter && `@${person.refs.twitter}`}
diff --git a/src/core.json b/src/core.json
index 5e0dd19..a288bea 100644
--- a/src/core.json
+++ b/src/core.json
@@ -227,29 +227,62 @@
       "kurt-opsahl",
       "guy-zyskind"
     ],
-    "all-speakers": [
-      "ameen-soleimani",
-      "guy-zyskind",
-      "max-hampshire",
-      "antoni-zolciak",
-      "rachel-rose-oleary",
-      "alex-kampa",
-      "oliver-gale",
-      "mario-havel",
-      "costanza-gallo",
-      "manu-alzuru",
-      "nick-almond",
-      "juraj-bednar",
-      "dcbuilder",
-      "alona-shevchenko",
-      "tibor-csoka",
-      "merula",
-      "serinko",
-      "steffen-kux",
-      "althea",
-      "mykola-siusko",
-      "pg",
-      "tree"
+    "core-contributors": [
+      {
+        "id": "mykola-siusko",
+        "name": "Mykola Siusko",
+        "caption": "Chief empathy officer",
+        "country": "es",
+        "imageUrl": "https://data.web3privacy.info/img/people/mykola-siusko.png"
+      },
+      {
+        "id": "pg",
+        "name": "PG",
+        "caption": "Larrikin sling master",
+        "country": "it",
+        "imageUrl": "https://data.web3privacy.info/img/people/pg.jpg"
+      },
+      {
+        "id": "michael-parenti",
+        "name": "Michael Parenti",
+        "caption": "Ops & vibe",
+        "country": "us",
+        "imageUrl": "/core-contributors/michael-parenti.png"
+      },
+      {
+        "id": "coinmandeer",
+        "name": "Coinmandeer",
+        "caption": "UI/UX Design & Brand",
+
+        "imageUrl": "https://data.web3privacy.info/img/people/coinmandeer.png"
+      },
+      {
+        "id": "robert",
+        "name": "Robert De Groot",
+        "caption": "Partnership & Volunteers",
+
+        "imageUrl": "https://data.web3privacy.info/img/people/coinmandeer.png"
+      },
+      {
+        "id": "cat",
+        "name": "CAT THAT LURKS",
+        "caption": "“Like all pure creatures, cats are practical.” – William S. Burroughs",
+
+        "imageUrl": "/core-contributors/cat.png"
+      },
+      {
+        "id": "odd",
+        "name": "ODD",
+        "caption": "Copywriting & Education",
+        "imageUrl": "/core-contributors/odd.png"
+      },
+      {
+        "id": "mf",
+        "name": "MF",
+        "caption": "master of caffeine",
+
+        "imageUrl": "/core-contributors/mf.png"
+      }
     ]
   },
   "research": [