updated to the end of this chapter