Final Proposal v2