Issue #34 - rework