Some changes

Bunch of changes