make updatePage method
remove useless comments
Merge remote-tracking branch 'origin/origin' into origin