added descriptions
merge