User-story-2 finished