Update to use-case 3