Some changes
Merge fixing