eight commit- fixed the paging issue