User-story-2 modified: much more simple to do !