This work addresses two related important themes in business and business schools today: expanding diversity in the workplace and the increasing reliance on teams as an organizational structure. The paper describes an approach for creating student work groups where the objective is to maximize within group diversity based upon multiple criteria. This approach is an extension of a heuristic-based multiple-criteria decision support system (MCADSS) developed in earlier work (Weitz and Jelassi [1992]); that system was successfully implemented, and is currently in use, at the European Institute of Business Administration (INSEAD) in Fontainebleau, France. The heuristic has been modified here to incorporate a different set of criteria, and to allow for students "placing out" of core courses. This paper discusses the modified system, its implementation at the Stern School of Business at New York University (NYU), and an empirical experiment evaluating the performance of the system.