some changes
merging