Replace probability distribution with weighted collection and close #12