Some changes
Merge done