Modified for Use case 3