Issue #22 Solutions