Some changes

* Changes