Updated for Draft 3.