Improved "Teacher"