Issue #121 - finalize story