Added some new changes