Add changes for appendix and Chapter 2