Finish up use case 1