merge liuqr's modified page and modified