Make Trapping Work for Self Defense