made stats gen dependent
Merge branch 'design' into gh-pages