Consolidated the Student and Teacher UPDATED message