Updates to your proposal for 3.x