diff --git a/_config.yml b/_config.yml
index 90fd4b7..5e892f7 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,4 +11,9 @@ author :
github : serg-delft
baseurl: "/ai4se" # the subpath of your site, e.g. /blog
-url: "https://se.ewi.tudelft.nl/" # the base hostname & protocol for your site, e.g.
\ No newline at end of file
+url: "https://se.ewi.tudelft.nl/" # the base hostname & protocol for your site, e.g.
+
+collections:
+ tracks :
+ output: true
+ sort_by: track-id
diff --git a/_layouts/default.html b/_layouts/default.html
index fa811a0..fc62ecd 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -29,6 +29,9 @@
AI4SE
+
+ Tracks
+
diff --git a/_layouts/track.html b/_layouts/track.html
index f248734..b73acaa 100644
--- a/_layouts/track.html
+++ b/_layouts/track.html
@@ -2,10 +2,10 @@
layout: default
---
-Research Track "{{ page.title }}"
+Track {{page.track-id}}: {{ page.title }}
-PhD Candidate: {{ page.phd }}
-Track leader: {{ page.leader }}
+Track leader at TU Delft: {{ page.tu-leader }}
+Track leader at JetBrains: {{ page.jb-leader }}
diff --git a/_tracks/01_code_gen_validation.md b/_tracks/01_code_gen_validation.md
index aec8ac8..a8e6950 100644
--- a/_tracks/01_code_gen_validation.md
+++ b/_tracks/01_code_gen_validation.md
@@ -2,7 +2,9 @@
layout: track
track-id: 1
title: Code Generation and Validation
-leader: Pouria Derakhshanfar
+tu-leader: Annibale Panichella
+jb-leader: Pouria Derakhshanfar
phd: To Be Hired
---
+This track focuses on code generation using AI techniques. We aim to explore the strategies for validating this generated code and how this generated code can help developers validate their handwritten code.
\ No newline at end of file
diff --git a/_tracks/02_llm_adaptation.md b/_tracks/02_llm_adaptation.md
new file mode 100644
index 0000000..0ce48b9
--- /dev/null
+++ b/_tracks/02_llm_adaptation.md
@@ -0,0 +1,10 @@
+---
+layout: track
+track-id: 2
+title: LLM Adaptation
+tu-leader: Maliheh Izadi
+jb-leader: Egor Bogomolov
+phd: To Be Hired
+---
+
+This track aims to refine generic large language models for code to suit various scenarios. By tailoring these models to the specific needs of individual users, projects, and organizations, we can ensure personalized outputs. The models will be optimized to produce legal, safe, and timely predictions and operate efficiently on low-resource devices.
\ No newline at end of file
diff --git a/_tracks/03_interactive_aligned_ide.md b/_tracks/03_interactive_aligned_ide.md
new file mode 100644
index 0000000..c780393
--- /dev/null
+++ b/_tracks/03_interactive_aligned_ide.md
@@ -0,0 +1,10 @@
+---
+layout: track
+track-id: 3
+title: Interactive and Aligned IDEs
+tu-leader: Maliheh Izadi
+jb-leader: Sergey Titov
+phd: To Be Hired
+---
+
+This track aims to embed emerging large language model practices, such as code generation or code explanation, into developers' workflows without disturbing users to improve their productivity. To do so, we will study user interaction with the model in IDEs, research the user experience, and investigate how to best build trust between developers and their intelligent agents.
\ No newline at end of file
diff --git a/_tracks/04_utilizing_runtime_data.md b/_tracks/04_utilizing_runtime_data.md
new file mode 100644
index 0000000..519f11c
--- /dev/null
+++ b/_tracks/04_utilizing_runtime_data.md
@@ -0,0 +1,10 @@
+---
+layout: track
+track-id: 4
+title: Utilizing Runtime Information to Improve Development Processes
+tu-leader: Thomas Durieux
+jb-leader: Egor Klimov
+phd: To Be Hired
+---
+
+This track aims to seamlessly integrate runtime information into JetBrains IDEs, elevating the development experience by enhancing code quality, pinpointing and addressing performance issues, and providing precise code assistance within the IDE environment. To achieve this, we will bridge the gap between static and dynamic information within machine learning techniques.
\ No newline at end of file
diff --git a/_tracks/05_intelligent_teaching_assistant.md b/_tracks/05_intelligent_teaching_assistant.md
new file mode 100644
index 0000000..2fdf4f2
--- /dev/null
+++ b/_tracks/05_intelligent_teaching_assistant.md
@@ -0,0 +1,10 @@
+---
+layout: track
+track-id: 5
+title: Intelligent Teaching Assistant in Programming Education
+tu-leader: Fenia Aivaloglou
+jb-leader: Anastasia Birillo
+phd: To Be Hired
+---
+
+This track aims to develop an intelligent, AI-based student assistant that provides context-informed support for programming education while stimulating knowledge transfer. We will focus specifically on how automatically generated hints can guide students toward the right solution, how students interact with the intelligent assistant, and how efficient their interactions are toward their learning objectives.
\ No newline at end of file
diff --git a/tracks.md b/tracks.md
index e914a75..163c74b 100644
--- a/tracks.md
+++ b/tracks.md
@@ -3,16 +3,12 @@ layout: default
title: Research Tracks
---
-# Research Tracks
+# AI4SE Tracks
-The current tracks are:
-
-| Track | PhD Candidate |
-|--------|---------------|
{% for track in site.tracks -%}
-{%- unless track.inactive -%}
- | [{{track.title}}]({{track.url | relative_url}}) | {{track.phd}} |
-{%- endunless -%}
-{% endfor -%}
+
+| [{{track.title}}]({{track.url | relative_url}}) |
+
+{% endfor %}
\ No newline at end of file