#47 Use case 9 almost migrated