Proposal up-to-date with google doc