Add shield + improve breakaway
Improve breakaway