reorganized and added content