Merged class time for student fix.