Adding Pagination again and commiting this time :)