Yes. We have a framework now around things like conflict. We have policies that require you to assess and reassess. It's called the situation management model. If you're going to intervene with a use of force, you always start off with the least intervention that you think is necessary and you escalate only after reassessing based on what's happening.
The real question is the degree to which the Correctional Service of Canada is accountable and making people accountable for following the policies. Sometimes it's not a matter of more training and new policies. Sometimes it's just a matter of making sure that people are held accountable for their actions when the policy is not followed or is ignored.
I don't think that requires more legislation. I think we need legislation around things like caps on segregation, prohibitions for some populations, and the role and model of independent adjudication.