Updated for new model of pages and such