Rearrangement, more drafting