addressed part 2 feedback on usecases