Pre-Battle rearrangement