Implemneted pageSize
Rearranged todo