Adding some changes
Merging