Updated changes from patch