next work is to finish the paging issue