Update to quiz mechanism