some updates, working on pagignation