latest changes for quizzes to work