Added weighted selection