Proposed updates for 1.6