made some changes
merging changes