Some changes
Merging