Reformat the old classes, Adding new question