Reordered some of the contents