Updated for ch02.