updated for classroom