modify details.
Merge branch 'design'