Resolving Discipline