Added and rearranged content.