My modified version of Matt's improvements to the sections on