Put the randomization and user-driven next back in