Proposed code changes round #1