Final changes + Appendix change