Discipline in the era of combined