Some changes in few files