Discipline, then and now