update description
merging back lost changes
Merge branch 'xx'