More rearrangements to match the new outline