wip
fix Story
wip