restructured some things in the Story