fix pagination bug
fix pagination bug
begin adding pagination