Discipline done right