Multi-class for students. More changes.