Fixed appendix and added SmartAMM