1. Introduction : international law, international organizations and dispute settlement : The WTO Agreement as a model for protecting freedom, non-discrimination and rule of law across frontiers? 2. The GATT dispute settlement system 1948-1995 : an overview; 3. Clarification and development of GATT/WTO law through the GATT/WTO dispute settlement system : the case law on trade- related environmental measures; 4. Non-violation complaints and situation complaints in GATT/WTO law : what is their legitimate function? 5. The new dispute settlement system of the 1994 WTO agreement; 6. The future of the GATT/WTO dispute settlement system : first experiences and remaining problems; Annexes : A. Table of reports issued under Article XXIII of the GATT 1947; B. Table of panel reports issued under the Tokyo Round Agreement of 1979; C. Table of disputes initiated under the dispute settlement understanding of the 1994 agreement establishing the World Trade Organization in 1995; D. Text of the understanding on rules and procedures governing the settlement of disputes (DSU); E. The WTO appellate body working procedures for appellate review;.