Some changes
Merge