added page handling