updated with new page code