Addressing Issue #4