Made some new changes