Added some code for quizzes