#7 Added pagination