Added stuff for quiz, and Admin