No null returns, plus new stats