Multi-class for students. Some of the changes.