Some changes
merging