adding Josh Long and Stas Zvinyatskovsky