Moved Matt's section and made some minor changes.