adding paging, broken headers