Updated for Ethan's VS; broke everything on Azure