Rearranged stuff and added content