Finished CR#7.