Updated with hopefully better ability to go to next page.