Milestone 6

merge in paging fix