Some rearrangement of things