diff --git a/_data/team_members.yml b/_data/team_members.yml
index 4bb88d0..f290dc0 100644
--- a/_data/team_members.yml
+++ b/_data/team_members.yml
@@ -7,16 +7,6 @@
   number_educ: 2
   education1: PhD, University of Cambridge
   education2: BSc, University of British Columbia
-  
-- name: Matei David
-  photo: matei.jpg
-  info: Research Software Developer, started 2013
-  email: matei.david@oicr.on.ca
-  github: https://github.com/mateidavid
-  twitter: https://twitter.com/mateidvd
-  number_educ: 2
-  education1: PhD, University of Toronto
-  education2: BSc, University of Toronto
 
 - name: Heather Gibling
   photo: heather.jpg
@@ -36,3 +26,22 @@
   twitter: 0
   number_educ: 1
   education1: BSc, McGill University
+
+- name: Hamza Khan
+  photo: hamza.jpg
+  info: Computational Biologist, started 2017
+  email: hamza.khan@oicr.on.ca
+  github: https://github.com/hamzakhanvit
+  twitter: 0
+  number_educ: 2
+  education1: MSc, University of British Columbia
+  education2: BTech, VIT University, India
+
+- name: Joanna Pineda
+  photo: joanna.jpg
+  info: Computational Biologist, started 2017
+  email: joanna.pineda@oicr.on.ca
+  github: https://github.com/jopineda
+  twitter: 0
+  number_educ: 1
+  education1: BSc, McGill University
diff --git a/_pages/team.md b/_pages/team.md
index 0fc220a..556692b 100644
--- a/_pages/team.md
+++ b/_pages/team.md
@@ -71,12 +71,22 @@ permalink: /team/
 <tr>
     <th>Staff</th>
 </tr>
+  <tr>
+    <td>Matei David, 2013-2017</td>
+  </tr>
   <tr>
     <td>Jonathan Dursi, 2015-2016</td>
   </tr>
   <tr>
     <td>Marina Barsky, 2013-2015</td>
   </tr>
+<tr>
+    <th>Undergraduate Students</th>
+</tr>
+  <tr>
+    <td>Tom Piao, 2016</td>
+  </tr>
+
 </table>
 
 <br />
diff --git a/assets/teampic/hamza.jpg b/assets/teampic/hamza.jpg
new file mode 100644
index 0000000..e528e5f
Binary files /dev/null and b/assets/teampic/hamza.jpg differ
diff --git a/assets/teampic/joanna.jpg b/assets/teampic/joanna.jpg
new file mode 100644
index 0000000..2a71310
Binary files /dev/null and b/assets/teampic/joanna.jpg differ