Started implementing weighting