Improve first user story