-              
{personData.role}
+              
{personData.role}
+              {personData.note ? 
{personData.note}
 : null}
               
               
diff --git a/src/components/people/People_Adnan_Fateryji.tsx b/src/components/people/People_Adnan_Fateryji.tsx
index 7fdfa86..b2ce3ba 100644
--- a/src/components/people/People_Adnan_Fateryji.tsx
+++ b/src/components/people/People_Adnan_Fateryji.tsx
@@ -3,7 +3,7 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Adnan Fatayerji',
-    role: 'Co-Founder, CEO',
+    role: 'Telecom Strategic Relations',
     imageUrl: '/images/people/adnan_fatayerji/adnan_fatayerji.jpg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/adnansf/',
diff --git a/src/components/people/People_Alexandre_Hannelas.tsx b/src/components/people/People_Alexandre_Hannelas.tsx
index 95e121d..3debe53 100644
--- a/src/components/people/People_Alexandre_Hannelas.tsx
+++ b/src/components/people/People_Alexandre_Hannelas.tsx
@@ -3,10 +3,11 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Alexandre Hannelas',
-    role: 'Finance Manager',
+    role: 'Financial Director, OurWorld',
     imageUrl: '/images/people/alexandre_hannelas/alexandre_hannelas.jpeg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/alexandre-hannelas-741681112/',
+    tags: ['In Residence'],
   },
 ]
 
diff --git a/src/components/people/People_Emre_Koc.tsx b/src/components/people/People_Emre_Koc.tsx
new file mode 100644
index 0000000..dd1fa0e
--- /dev/null
+++ b/src/components/people/People_Emre_Koc.tsx
@@ -0,0 +1,25 @@
+import { PersonTemplate } from '@/components/PersonTemplate'
+
+export const data = [
+  {
+    name: 'Emre Koc',
+    role: 'Sustainability Engineer & Program Manager',
+    imageUrl: '/images/people/emre_koc/emre_koc.jpg',
+    xUrl: '#',
+    linkedinUrl: 'https://www.linkedin.com/in/remrekoc/',
+    tags: ['In Residence'],
+  },
+]
+
+const biography = `
+  
+    Emre combines a background in mechanical engineering and computer science with a focus on energy systems and urban sustainability. He is passionate about decentralization and empowering people to reclaim their rights and autonomy in the digital age.
+  
+  
+    At OurWorld, Emre serves as a Program Manager coordinating initiatives in Zanzibar, including the Zanzibar Cyber City and Free Zone. As a Sustainability Engineer, he ensures that local operations and infrastructure developments meet the highest standards of environmental and social responsibility.
+  
+`
+
+export function People_Emre_Koc() {
+  return 
+}
diff --git a/src/components/people/People_Florian_Fournier.tsx b/src/components/people/People_Florian_Fournier.tsx
index edc7c47..31d3f04 100644
--- a/src/components/people/People_Florian_Fournier.tsx
+++ b/src/components/people/People_Florian_Fournier.tsx
@@ -3,10 +3,11 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Florian Fournier',
-    role: 'Co-Founder',
+    role: 'Marketing & Business Development',
     imageUrl: '/images/people/florian_fournier/florian_fournier.jpeg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/florianfournier/',
+    tags: ['In Residence'],
   },
 ]
 
diff --git a/src/components/people/People_Gregory_Flipo.tsx b/src/components/people/People_Gregory_Flipo.tsx
index 6da7ad7..40efaec 100644
--- a/src/components/people/People_Gregory_Flipo.tsx
+++ b/src/components/people/People_Gregory_Flipo.tsx
@@ -3,7 +3,7 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Gregory Flipo',
-    role: 'Co-Founder, CEO of Sikana',
+    role: 'NGO Strategic Relations',
     imageUrl: '/images/people/gregory_flipo/gregory_flipo.jpg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/gregory-flipo-34a9947/',
diff --git a/src/components/people/People_Hugo_Mathecowitsch.tsx b/src/components/people/People_Hugo_Mathecowitsch.tsx
index 942ffe0..d47e044 100644
--- a/src/components/people/People_Hugo_Mathecowitsch.tsx
+++ b/src/components/people/People_Hugo_Mathecowitsch.tsx
@@ -3,7 +3,7 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Hugo Mathecowitsch',
-    role: 'Advisor, Product',
+    role: 'Strategic Advisory Board, Fintech',
     imageUrl: '/images/people/hugo_mathecowitsch/hugo_mathecowitsch.jpeg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/hugo-mathecowitsch-9447a3213/',
diff --git a/src/components/people/People_Jan_De_Landtsheer.tsx b/src/components/people/People_Jan_De_Landtsheer.tsx
index 42b8887..fa077c7 100644
--- a/src/components/people/People_Jan_De_Landtsheer.tsx
+++ b/src/components/people/People_Jan_De_Landtsheer.tsx
@@ -3,10 +3,11 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Jan De Landtsheer',
-    role: 'Advisor, Tech',
+    role: 'System Architect',
     imageUrl: '/images/people/jan_de_landtsheer/jan_de_landtsheer.jpeg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/jand2/',
+    tags: ['In Residence'],
   },
 ]
 
diff --git a/src/components/people/People_Malte_Geierhos.tsx b/src/components/people/People_Malte_Geierhos.tsx
index ce4f922..86e413c 100644
--- a/src/components/people/People_Malte_Geierhos.tsx
+++ b/src/components/people/People_Malte_Geierhos.tsx
@@ -3,7 +3,7 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Malte Geierhos',
-    role: 'Team Member',
+    role: 'Tech Architect',
     imageUrl: '/images/people/malte_geierhos/malte_geierhos.png',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/malte-geierhos/',
diff --git a/src/components/people/People_Marion_Ravarino.tsx b/src/components/people/People_Marion_Ravarino.tsx
index 9b8446f..6d892a9 100644
--- a/src/components/people/People_Marion_Ravarino.tsx
+++ b/src/components/people/People_Marion_Ravarino.tsx
@@ -7,6 +7,7 @@ export const data = [
     imageUrl: '/images/people/marion_ravarino/marion_ravarino.jpeg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/marion-ravarino/',
+    tags: ['In Residence'],
   },
 ]
 
diff --git a/src/components/people/People_Michel_Coucke.tsx b/src/components/people/People_Michel_Coucke.tsx
index 77de108..eda5d6a 100644
--- a/src/components/people/People_Michel_Coucke.tsx
+++ b/src/components/people/People_Michel_Coucke.tsx
@@ -3,7 +3,7 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Michel Coucke',
-    role: 'Director',
+    role: 'Strategic Advisory Board, Human Resources',
     imageUrl: '/images/people/michel_coucke/michel_coucke.jpg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/michel-coucke-66112a/',
diff --git a/src/components/people/People_Nousrath_Bhugeloo.tsx b/src/components/people/People_Nousrath_Bhugeloo.tsx
index d3e4439..d0be6e9 100644
--- a/src/components/people/People_Nousrath_Bhugeloo.tsx
+++ b/src/components/people/People_Nousrath_Bhugeloo.tsx
@@ -3,7 +3,7 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Nousrath Bhugeloo',
-    role: 'Director & Executive Chairperson',
+    role: 'Director & Executive Chair',
     imageUrl: '/images/people/nousrath_bhugeloo/nousrath_bhugeloo.jpg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/nousrath-bhugeloo-78078520/',
diff --git a/src/components/people/People_Owen_Kemp.tsx b/src/components/people/People_Owen_Kemp.tsx
index 66018ee..5166299 100644
--- a/src/components/people/People_Owen_Kemp.tsx
+++ b/src/components/people/People_Owen_Kemp.tsx
@@ -3,7 +3,7 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Owen Kemp',
-    role: 'Advisor, Business Development',
+    role: 'Strategic Advisory Board, Geo Expansion',
     imageUrl: '/images/people/owen_kemp/owen_kemp.jpeg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/owen-kemp/',
diff --git a/src/components/people/People_Sacha_Obeegadoo.tsx b/src/components/people/People_Sacha_Obeegadoo.tsx
index 74fae4b..9a4c204 100644
--- a/src/components/people/People_Sacha_Obeegadoo.tsx
+++ b/src/components/people/People_Sacha_Obeegadoo.tsx
@@ -3,10 +3,11 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Sacha Obeegadoo',
-    role: 'Program Manager',
+    role: 'COO',
     imageUrl: '/images/people/sacha_obeegadoo/sacha_obeegadoo.jpg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/sachaobeegadoo/',
+    tags: ['In Residence'],
   },
 ]
 
diff --git a/src/components/people/People_Sam_Taggart.tsx b/src/components/people/People_Sam_Taggart.tsx
index d6a4aeb..60f7986 100644
--- a/src/components/people/People_Sam_Taggart.tsx
+++ b/src/components/people/People_Sam_Taggart.tsx
@@ -3,10 +3,11 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Sam Taggart',
-    role: 'Communication & Community',
+    role: 'Community Builder',
     imageUrl: '/images/people/sam_taggart/sam_taggart.jpg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/samtaggart/',
+    tags: ['In Residence'],
   },
 ]
 
diff --git a/src/components/people/People_Sasha_Astiadi.tsx b/src/components/people/People_Sasha_Astiadi.tsx
index ab65219..04d572f 100644
--- a/src/components/people/People_Sasha_Astiadi.tsx
+++ b/src/components/people/People_Sasha_Astiadi.tsx
@@ -3,10 +3,11 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Sasha Astiadi',
-    role: 'Web Operations',
+    role: 'Web Architect',
     imageUrl: '/images/people/sasha_astiadi/sasha_astiadi.png',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/sastiadi/',
+    tags: ['In Residence'],
   },
 ]
 
diff --git a/src/components/people/People_Timur_Gordon.tsx b/src/components/people/People_Timur_Gordon.tsx
index d1f6e9e..3f83a9b 100644
--- a/src/components/people/People_Timur_Gordon.tsx
+++ b/src/components/people/People_Timur_Gordon.tsx
@@ -3,10 +3,11 @@ import { PersonTemplate } from '@/components/PersonTemplate'
 export const data = [
   {
     name: 'Timur Gordon',
-    role: 'Software Developer',
+    role: 'Software Architect',
     imageUrl: '/images/people/timur_gordon/timur_gordon.jpg',
     xUrl: '#',
     linkedinUrl: 'https://www.linkedin.com/in/timur-gordon/',
+    tags: ['In Residence'],
   },
 ]
 
diff --git a/src/lib/peopleData.ts b/src/lib/peopleData.ts
index 5f85057..70e147f 100644
--- a/src/lib/peopleData.ts
+++ b/src/lib/peopleData.ts
@@ -7,6 +7,8 @@ export interface PersonData {
   imageUrl: string
   xUrl: string
   linkedinUrl: string
+  tags?: string[]
+  note?: string
 }
 
 // Function to dynamically get all people data
@@ -18,6 +20,7 @@ export async function getAllPeopleData(): Promise
 {
     () => import('@/components/people/People_Adnan_Fateryji'),
     () => import('@/components/people/People_Alexandre_Hannelas'),
     () => import('@/components/people/People_Chris_Camponovo'),
+    () => import('@/components/people/People_Emre_Koc'),
     () => import('@/components/people/People_Florian_Fournier'),
     () => import('@/components/people/People_Gregory_Flipo'),
     () => import('@/components/people/People_Hugo_Mathecowitsch'),
@@ -54,6 +57,7 @@ export async function getAllPeopleData(): Promise {
 import { data as adnan_fateryjiData } from '@/components/people/People_Adnan_Fateryji'
 import { data as alexandre_hannelasData } from '@/components/people/People_Alexandre_Hannelas'
 import { data as chris_camponovoData } from '@/components/people/People_Chris_Camponovo'
+import { data as emre_kocData } from '@/components/people/People_Emre_Koc'
 import { data as florian_fournierData } from '@/components/people/People_Florian_Fournier'
 import { data as gregory_flipoData } from '@/components/people/People_Gregory_Flipo'
 import { data as hugo_mathecowitschData } from '@/components/people/People_Hugo_Mathecowitsch'
@@ -75,15 +79,15 @@ export function getAllPeopleDataSync(): PersonData[] {
   const allPeopleData: PersonData[] = []
 
   try {
-    allPeopleData.push(...adnan_fateryjiData)
+    allPeopleData.push(...kristof_de_spiegeleerData)
   } catch (error) {
-    console.error('Error loading adnan_fateryji data:', error)
+    console.error('Error loading kristof_de_spiegeleer data:', error)
   }
 
   try {
-    allPeopleData.push(...alexandre_hannelasData)
+    allPeopleData.push(...adnan_fateryjiData)
   } catch (error) {
-    console.error('Error loading alexandre_hannelas data:', error)
+    console.error('Error loading adnan_fateryji data:', error)
   }
 
   try {
@@ -98,6 +102,12 @@ export function getAllPeopleDataSync(): PersonData[] {
     console.error('Error loading florian_fournier data:', error)
   }
 
+  try {
+    allPeopleData.push(...alexandre_hannelasData)
+  } catch (error) {
+    console.error('Error loading alexandre_hannelas data:', error)
+  }
+  
   try {
     allPeopleData.push(...gregory_flipoData)
   } catch (error) {
@@ -122,12 +132,6 @@ export function getAllPeopleDataSync(): PersonData[] {
     console.error('Error loading karoline_zizka data:', error)
   }
 
-  try {
-    allPeopleData.push(...kristof_de_spiegeleerData)
-  } catch (error) {
-    console.error('Error loading kristof_de_spiegeleer data:', error)
-  }
-
   try {
     allPeopleData.push(...malte_geierhosData)
   } catch (error) {
@@ -182,6 +186,12 @@ export function getAllPeopleDataSync(): PersonData[] {
     console.error('Error loading timur_gordon data:', error)
   }
 
+  try {
+    allPeopleData.push(...emre_kocData)
+  } catch (error) {
+    console.error('Error loading emre_koc data:', error)
+  }
+
   try {
     allPeopleData.push(...vianney_sprietData)
   } catch (error) {