Additions from chapter 8