Adding some new changes