Better story structure; third segment; some name changes