This chapter draws on the WTO experience to identify problematic aspects of the Agreement on Agriculture and opportunities going forward. The documented shift toward non-distorting support can be built upon, while the concentration of applied support implies need to balance new disciplines across diverse policy measures among developed and developing members. Problematic member bifurcations include some with positive BTAMSs while others face de minimis limits, and exemption for unlimited investment and input subsidies of developing countries. A bargain is proposed to address jointly excessive distorting support allowed different groups of members, and to bring MPS measurement closer to its economic size. Exemptible blue box payments and green box payments are argued to be less problematic, with further clarity needed about rules with respect to support related to climate change mitigation and other high-profile policy priorities. Addressing non-trade priorities is found compatible with strengthened rules to reducing trade and production distortions.