Adapt to new array layout

Each story has its own array now. Adapting to that.
Merge branch 'newarray'