adding some changes
merging changes