Change onPage helper to currentPage