Making some changes in UseCases
pff: