Some changes

Check it.