Changed row limit from 20 to 25