Issue #7 reworks