Updated the questionnaire based on feedback from Gary