Some rearrangements, updated patch.