Use case 5-6

Completed #3