Progress on Revising the Consumer Price Index Manual: Chapters 15-23, Part II Erwin Diewert, University of British Columbia and University of New South Wales