made stats gen dependent
Merge conflict