Merge branch 'weighted'