Issue #125 - addressing comments, part 1.5
- still value