Update from PR review
Update from PR review

briehl/narrative,briehl/narrative,kbase/narrative,kbase/narrative,briehl/narrative,briehl/narrative,kbase/narrative,kbase/narrative,kbase/narrative,kbase/narrative,briehl/narrative,briehl/narrative,briehl/narrative