modified files for new pagination