A little rearrangement of the topics