Proposed Code Changes