Issue #25 post design review