Removed default limit of 20 - now unlimited