With figures and appendix version beta