Update chapter 21-END