added new use cases, modified old one