Some changes

Some changes