Updated file to new changes