Discipline and Punish

Foucault speaks of a shift from corporal punishment to non-corporal. However, evident by his length description of the architecture of the military camp and prison, this concept of non-corporal punishment continues to rely heavily not just on physical space but on the human body as well. Do you agree? As you understand it, is the shift described linear in nature, a simply transition from corporal to non-corporal? Or are there other factors at play?