Refactored MiniSurvey