added custom weighting
Adding more stats