adding all the new changes