Updated changes except for sort