diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html
index f6059590e459faf234d53f54a83c9acc9a66d529..ec61c94da6c094d12d5169923846fc97ca871c81 100644
--- a/pinaxcon/templates/static_pages/about/team.html
+++ b/pinaxcon/templates/static_pages/about/team.html
@@ -41,12 +41,9 @@ Our team of North Bay and Bay Area locals has years of experience building commu
Sam is a Python developer and distributed-systems "enthusiast" hailing from Seattle by birth, New York by nurture, and the Bay Area by choice. Five years ago he attended his first PyCon US and hasn't been able to break the habit; after making the jump from audience to stage in 2014 and speaking regularly at events around the world, he was thrilled to join the team when invited by Chris and Josh. Sam currently works at Nuna building healthcare data infrastructure for the U.S. Medicaid and Medicare programs and resides in Oakland with his husband Kameron. (@skimbrel on Twitter)
-Andrew Godwin, Treasurer
-
-Andrew is a Django and Python developer who originally hails from London but moved to the Bay Area five years ago. He's been writing open source software for over a decade as well as working in various different parts of the technology industry, and currently works at Eventbrite. He regularly speaks at Python (and other) events around the world, and has a keen interest in building communities and inclusivity. (@andrewgodwin on Twitter)
-
Josh Simmons, Communications and Outreach
-Josh is a painfully earnest community strategist and recovering web developer. Born and raised in the North Bay, he spent 4.5 years building Web & Interactive Media Professionals (WIMP), a local community, before moving on to do community management for O'Reilly Media. These days Josh does communications for Google Open Source and serves as CFO for the Open Source Initiative (OSI). He loves to help free software communities become more welcoming and introduce students and junior developers to open source. (@joshsimmons on Twitter)
+Josh is a painfully earnest community strategist and recovering web developer. Born and raised in the North Bay, he spent 4.5 years building Web & Interactive Media Professionals (WIMP), a local community, before moving on to do community management for O'Reilly Media. These days Josh does open source strategy for Salesforce and serves as VP of the Open Source Initiative (OSI). He loves to help free software communities become more welcoming and introduce students and junior developers to open source. (@joshsimmons on Twitter)
Sarah Kuchinsky
Sarah is a Python developer, Stanford graduate student, and head organizer of PyLadies Silicon Valley. Sarah fell in love with the Python community in 2012, after joining PyLadies and attending her first PyCon. She joined the North Bay Python organising team for our first conference in 2017. Sarah’s areas of study include algorithms, economics, and health policy modeling. (@sarahkuchinksy on Twitter)
@@ -62,6 +59,13 @@ After leaving academia 20 years ago, Max became a freelance developer and open s
+Emeritus Organizers
+
+Andrew Godwin, Treasurer
+
+Andrew is a Django and Python developer who originally hails from London but moved to the Bay Area five years ago. He's been writing open source software for over a decade as well as working in various different parts of the technology industry, and currently works at Eventbrite. He regularly speaks at Python (and other) events around the world, and has a keen interest in building communities and inclusivity. (@andrewgodwin on Twitter)
+
+
Advisors
We acknowledge that our small team has limited perspective, and that to build a truly inclusive event, we need to seek the perspectives of a diverse range of people. We thank the following people and organizations for providing us with advice along the way.