incorporate Kim's edits to Dmitriy's PR #29