Address Team/Survey changes