few changes to incorporate Justin's quiz classes