- Optimized paging method and fixed more buggggss