removed refs to curPage