updated story
Merge branch 'paul' into devbranch