modification on question_set