Updated new changes