Make demo more exhaustive