update to questionnaire and graph