added new pages, updated functions