Both, and they are not as separate as you might think. Discipline without a system is just willpower, and willpower runs out.