Done the new changes