Fix roulette and add loop