refactor teh scheme to advanced questionnaire