Fighting was a mess, redoing that