Addressing Issue #7