Issue #206 Implementation