Added more weighting options