Update to use new Quiz