some changes in doc
merging