Teach More and Discipline Less