refactored and added pagination