Implemented Proposed Code Changes