Some changes
Other changes