Improve code and story.