Changes for PAgination and some other

Changes for PAgination and some other