diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html
index 1a0b70621d36e8aad03e8b8f573eceb99c855749..567a5317a041bf2f34807ab5af2c61da9484b380 100644
--- a/pinaxcon/templates/static_pages/about/team.html
+++ b/pinaxcon/templates/static_pages/about/team.html
@@ -41,12 +41,12 @@ Our team of North Bay and Bay Area locals has years of experience building commu
 
 <p><img src="{% static "images/team/sam.jpg" %}" alt="Sam Kitajima-Kimbrel" class="team-headshot circle">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. (<a href="https://twitter.com/skimbrel">@skimbrel on Twitter</a>)</p>
 
-<h3>Andrew Godwin</h3>
+<h3>Andrew Godwin, Treasurer</h3>
 
 <p><img src="{% static "images/team/andrew.jpg" %}" alt="Andrew Godwin" class="team-headshot circle">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. (<a href="https://twitter.com/andrewgodwin">@andrewgodwin on Twitter</a>)</p>
 
-<h3>Josh Simmons</h3>
-<p><img src="{% static "images/team/josh.jpg" %}" alt="Josh Simmons" class="team-headshot circle">Josh is a community organizer and web developer with a penchant for armchair philosophy who was born and raised in the North Bay. He spent 4.5 years building Web &amp; Interactive Media Professionals (WIMP), a local community with over 600 members, before moving on to do community management for O'Reilly Media. These days Josh works on the Google Open Source outreach team and serves as a board member and volunteer CFO for Open Source Initiative. (<a href="https://twitter.com/joshsimmons">@joshsimmons on Twitter</a>)</p>
+<h3>Josh Simmons, Communications and Outreach</h3>
+<p><img src="{% static "images/team/josh.jpg" %}" alt="Josh Simmons" class="team-headshot circle">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 &amp; 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. (<a href="https://twitter.com/joshsimmons">@joshsimmons on Twitter</a>)</p>
 
 <h3>Frances Hocutt</h3>
 <p><img src="{% static "images/team/frances.jpeg" %}" alt="Frances Hocutt" class="team-headshot circle">Frances Hocutt has taken part in the science-to-tech branch of the great STEM reshuffling. In the process, he’s written, spoken, mentored, and co-founded Seattle’s first feminist hackerspace/makerspace. Frances prefers elegance in science and effectiveness in art and is happiest when drawing on as many disciplines as possible. Frances jumped into F/OSS development with work on standards for the MediaWiki web API ecosystem and expanded into work on MediaWiki and associated Wikimedia-ecosystem contributor tools. He currently installs software on other people’s computers for Rackspace Managed Security’s defensive infrastructure team. Frances currently lives in an unfortunately catless apartment in Oakland, CA.