some more modifications to pair roulette and the flow