updated all descriptions
merge conflict