Proposed changes for #2