some changes
merging changes