Improved structure and added content