more refactoringz for new survey