Adding all new changes