diff --git a/exampleSite/data/experience.yaml b/exampleSite/data/experience.yaml
index 69e54ff..add91f3 100644
--- a/exampleSite/data/experience.yaml
+++ b/exampleSite/data/experience.yaml
@@ -1,20 +1,27 @@
-- name: "CEO"
-  company: "Google"
-  details: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ornare sollicitudin fringilla.
+- company: Uber
+  roles:
+    - role: Data Scientist
+      details: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ornare sollicitudin fringilla.
               Aenean nec volutpat arcu. Maecenas quis tempus risus. Curabitur condimentum ligula in erat pharetra porta. 
               Nam suscipit nisi a bibendum lacinia. Donec aliquet, nibh dignissim placerat efficit"
-  date: "2019 - Present"
+      date: "10.2020 -  Present"
 
-- name: "Junior Software Developer"
-  company: "Google"
-  date: "10.2018 - Present"
-  details: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ornare sollicitudin fringilla.
+- company: Google
+  roles: 
+    - role: Senior Software Developer
+      details: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ornare sollicitudin fringilla.
+              Aenean nec volutpat arcu. Maecenas quis tempus risus. "
+      date: "06.2019 - 10.2020"
+    
+    - role: Junior Software Developer
+      date: "10.2018 - 06.2019"
+      details: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ornare sollicitudin fringilla.
+              Aenean nec volutpat arcu. Maecenas quis tempus risus. "
+
+- company: Uber
+  roles:
+    - role: Driver
+      details: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ornare sollicitudin fringilla.
               Aenean nec volutpat arcu. Maecenas quis tempus risus. Curabitur condimentum ligula in erat pharetra porta. 
               Nam suscipit nisi a bibendum lacinia. Donec aliquet, nibh dignissim placerat efficit"
-
-- name: "CTO"
-  company: "Uber"
-  date: "11.2016 - 07.2017"
-  details: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ornare sollicitudin fringilla.
-              Aenean nec volutpat arcu. Maecenas quis tempus risus. Curabitur condimentum ligula in erat pharetra porta. 
-              Nam suscipit nisi a bibendum lacinia. Donec aliquet, nibh dignissim placerat efficit"
\ No newline at end of file
+      date: "2017 - 2018"
\ No newline at end of file
diff --git a/layouts/partials/experience.html b/layouts/partials/experience.html
index 8db7e59..7db932d 100644
--- a/layouts/partials/experience.html
+++ b/layouts/partials/experience.html
@@ -1,25 +1,17 @@
 <div class="section">
     <h1 class="section-title">{{ .Site.Params.title_as.experience }}</h1>
-    {{ $companies := slice }}
     {{ range .Site.Data.experience }}
-    {{ $companies = $companies | append .company }}
-{{ end }}
-
-{{ $companies = uniq $companies }}
-
-{{ range $companies }}
-    {{ $company := . }}
-
     <div class="item group">
-        <h3 class="item-title">{{ $company }}</h3>
-    {{ range where $.Site.Data.experience "company" $company }}
-    <div class="item">
-        <div class="flex-row">
-            <span class="job-title">{{ .name }}</span>
-            <span class="date">{{ .date }}</span></div>
+        <h3 class="item-title">{{ .company }}</h3>
+        {{ range .roles }}
+        <div class="item">
+            <div class="flex-row">
+                <span class="job-title">{{ .role }}</span>
+                <span class="date">{{ .date }}</span>
+            </div>
             <p>{{ .details | markdownify }}</p>
-        </div>
-    {{ end }}
+        </div>        
+        {{ end }}
     </div>
-{{ end }}
+    {{ end }}
 </div>
\ No newline at end of file