Finish up to section 7.23