Some changes

Here are some changes...