More w_candidate stuffs
Merge pull request #290 from NielsZeilemaker/discoveryv1.3

More w_candidate stuffs