Added weighting properly back in