converted to criteria, added more pagination params and calls