updated to add Paging