made some changes
merge done