#4 Added pagination